@shortkitsdk/react-native 0.2.0 → 0.2.1

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

@@ -5,10 +5,14 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.shortkit.CarouselImage
 import com.shortkit.ContentItem
 import com.shortkit.ContentSignal
+import com.shortkit.CustomFeedItem
+import com.shortkit.ImageCarouselItem
 import com.shortkit.FeedConfig
 import com.shortkit.FeedHeight
+import com.shortkit.FeedSource
 import com.shortkit.FeedTransitionPhase
 import com.shortkit.JsonValue
 import com.shortkit.ShortKit
@@ -89,6 +93,7 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
     override fun initialize(
         apiKey: String,
         config: String,
+        embedId: String?,
         clientAppName: String?,
         clientAppVersion: String?,
         customDimensions: String?
@@ -105,6 +110,7 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
             context = context,
             apiKey = apiKey,
             config = feedConfig,
+            embedId = embedId,
             userId = null,
             adProvider = null,
             clientAppName = clientAppName,
@@ -115,6 +121,16 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
         shared = this
 
         subscribeToFlows(sdk.player)
+
+        sdk.delegate = object : com.shortkit.ShortKitDelegate {
+            override fun onContentTapped(contentId: String, index: Int) {
+                val params = Arguments.createMap().apply {
+                    putString("contentId", contentId)
+                    putInt("index", index)
+                }
+                sendEvent("onContentTapped", params)
+            }
+        }
     }
 
     @ReactMethod
@@ -211,6 +227,43 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
         shortKit?.player?.setMaxBitrate(bitrate.toInt())
     }
 
+    // -----------------------------------------------------------------------
+    // Custom feed
+    // -----------------------------------------------------------------------
+
+    @ReactMethod
+    override fun setFeedItems(items: String) {
+        val parsed = parseCustomFeedItems(items) ?: return
+        shortKit?.setFeedItems(parsed)
+    }
+
+    @ReactMethod
+    override fun appendFeedItems(items: String) {
+        val parsed = parseCustomFeedItems(items) ?: return
+        shortKit?.appendFeedItems(parsed)
+    }
+
+    @ReactMethod
+    override fun fetchContent(limit: Double, promise: com.facebook.react.bridge.Promise) {
+        val sdk = shortKit
+        if (sdk == null) {
+            promise.resolve("[]")
+            return
+        }
+        scope?.launch {
+            try {
+                val items = sdk.fetchContent(limit.toInt())
+                val arr = JSONArray()
+                for (item in items) {
+                    arr.put(JSONObject(serializeContentItemToJSON(item)))
+                }
+                promise.resolve(arr.toString())
+            } catch (e: Exception) {
+                promise.resolve("[]")
+            }
+        }
+    }
+
     // -----------------------------------------------------------------------
     // Overlay lifecycle events (called by Fabric view)
     // -----------------------------------------------------------------------
@@ -385,6 +438,16 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
                 sendEvent("onPrefetchedAheadCountChanged", params)
             }
         }
+
+        // Remaining content count
+        newScope.launch {
+            player.remainingContentCount.collect { count ->
+                val params = Arguments.createMap().apply {
+                    putInt("count", count)
+                }
+                sendEvent("onRemainingContentCountChanged", params)
+            }
+        }
     }
 
     // -----------------------------------------------------------------------
@@ -425,6 +488,7 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
     private fun contentItemMap(item: ContentItem): WritableMap {
         return Arguments.createMap().apply {
             putString("id", item.id)
+            item.playbackId?.let { putString("playbackId", it) }
             putString("title", item.title)
             item.description?.let { putString("description", it) }
             putDouble("duration", item.duration)
@@ -575,13 +639,17 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
             val muteOnStart = obj.optBoolean("muteOnStart", true)
             val videoOverlay = parseVideoOverlay(obj.optString("overlay", null))
 
+            val feedSourceStr = obj.optString("feedSource", "algorithmic")
+            val feedSource = if (feedSourceStr == "custom") FeedSource.CUSTOM else FeedSource.ALGORITHMIC
+
             FeedConfig(
                 feedHeight = feedHeight,
                 videoOverlay = videoOverlay,
                 carouselOverlay = CarouselOverlayMode.None,
                 surveyOverlay = SurveyOverlayMode.None,
                 adOverlay = AdOverlayMode.None,
-                muteOnStart = muteOnStart
+                muteOnStart = muteOnStart,
+                feedSource = feedSource
             )
         } catch (_: Exception) {
             FeedConfig()
@@ -644,6 +712,54 @@ class ShortKitModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    private fun parseCustomFeedItems(json: String): List<CustomFeedItem>? {
+        return try {
+            val arr = JSONArray(json)
+            val result = mutableListOf<CustomFeedItem>()
+            for (i in 0 until arr.length()) {
+                val obj = arr.getJSONObject(i)
+                when (obj.optString("type")) {
+                    "video" -> {
+                        val playbackId = obj.optString("playbackId", null) ?: continue
+                        result.add(CustomFeedItem.Video(playbackId))
+                    }
+                    "imageCarousel" -> {
+                        val itemObj = obj.optJSONObject("item") ?: continue
+                        val carouselItem = parseImageCarouselItem(itemObj) ?: continue
+                        result.add(CustomFeedItem.ImageCarousel(carouselItem))
+                    }
+                }
+            }
+            result.ifEmpty { null }
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    private fun parseImageCarouselItem(obj: JSONObject): ImageCarouselItem? {
+        val id = obj.optString("id", null) ?: return null
+        val imagesArr = obj.optJSONArray("images") ?: return null
+        val images = mutableListOf<CarouselImage>()
+        for (i in 0 until imagesArr.length()) {
+            val imgObj = imagesArr.getJSONObject(i)
+            images.add(CarouselImage(
+                url = imgObj.getString("url"),
+                alt = imgObj.optString("alt", null)
+            ))
+        }
+        return ImageCarouselItem(
+            id = id,
+            images = images,
+            autoScrollInterval = if (obj.has("autoScrollInterval")) obj.getDouble("autoScrollInterval") else null,
+            caption = obj.optString("caption", null),
+            title = obj.optString("title", null),
+            description = obj.optString("description", null),
+            author = obj.optString("author", null),
+            section = obj.optString("section", null),
+            articleUrl = obj.optString("articleUrl", null)
+        )
+    }
+
     /**
      * Parse optional custom dimensions JSON string into map.
      */

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

@@ -35,6 +35,10 @@ class ShortKitPackage : TurboReactPackage() {
     override fun createViewManagers(
         reactContext: ReactApplicationContext
     ): List<ViewManager<*, *>> {
-        return listOf(ShortKitFeedViewManager())
+        return listOf(
+            ShortKitFeedViewManager(),
+            ShortKitPlayerViewManager(),
+            ShortKitWidgetViewManager(),
+        )
     }
 }

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

@@ -0,0 +1,136 @@
+package com.shortkit.reactnative
+
+import android.content.Context
+import android.widget.FrameLayout
+import com.shortkit.sdk.config.PlayerClickAction
+import com.shortkit.sdk.config.PlayerConfig
+import com.shortkit.sdk.config.VideoOverlayMode
+import com.shortkit.sdk.model.ContentItem
+import com.shortkit.sdk.player.ShortKitPlayerView
+import org.json.JSONObject
+
+/**
+ * Fabric native view wrapping [ShortKitPlayerView] for use as a
+ * single-video player in React Native.
+ */
+class ShortKitPlayerNativeView(context: Context) : FrameLayout(context) {
+
+    private var playerView: ShortKitPlayerView? = null
+    private var configJson: String? = null
+    private var contentItemJson: String? = null
+
+    var config: String?
+        get() = configJson
+        set(value) {
+            if (value == configJson) return
+            configJson = value
+            rebuildIfNeeded()
+        }
+
+    var contentItem: String?
+        get() = contentItemJson
+        set(value) {
+            if (value == contentItemJson) return
+            contentItemJson = value
+            applyContentItem()
+        }
+
+    var active: Boolean = true
+        set(value) {
+            if (field == value) return
+            field = value
+            applyActive()
+        }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        rebuildIfNeeded()
+    }
+
+    override fun onDetachedFromWindow() {
+        playerView?.deactivate()
+        super.onDetachedFromWindow()
+    }
+
+    private fun rebuildIfNeeded() {
+        if (playerView != null) return
+
+        val sdk = ShortKitModule.shared?.sdk ?: return
+        val playerConfig = parsePlayerConfig(configJson)
+
+        val view = ShortKitPlayerView(context).apply {
+            layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        }
+        view.initialize(sdk, playerConfig)
+        addView(view)
+        playerView = view
+
+        applyContentItem()
+        if (active) view.activate()
+    }
+
+    private fun applyContentItem() {
+        val json = contentItemJson ?: return
+        val view = playerView ?: return
+        val item = parseContentItem(json) ?: return
+        view.configure(item)
+    }
+
+    private fun applyActive() {
+        val view = playerView ?: return
+        if (active) view.activate() else view.deactivate()
+    }
+
+    private fun parsePlayerConfig(json: String?): PlayerConfig {
+        if (json.isNullOrEmpty()) return PlayerConfig()
+        return try {
+            val obj = JSONObject(json)
+            PlayerConfig(
+                cornerRadius = obj.optDouble("cornerRadius", 12.0).toFloat(),
+                clickAction = when (obj.optString("clickAction", "feed")) {
+                    "feed" -> PlayerClickAction.FEED
+                    "mute" -> PlayerClickAction.MUTE
+                    "none" -> PlayerClickAction.NONE
+                    else -> PlayerClickAction.FEED
+                },
+                autoplay = obj.optBoolean("autoplay", true),
+                loop = obj.optBoolean("loop", true),
+                muteOnStart = obj.optBoolean("muteOnStart", true),
+                videoOverlay = parseOverlay(obj),
+            )
+        } catch (_: Exception) {
+            PlayerConfig()
+        }
+    }
+
+    private fun parseOverlay(obj: JSONObject): VideoOverlayMode {
+        val overlay = obj.opt("overlay") ?: return VideoOverlayMode.None
+        if (overlay is JSONObject && overlay.optString("type") == "custom") {
+            return VideoOverlayMode.Custom {
+                ShortKitOverlayBridge(context)
+            }
+        }
+        return VideoOverlayMode.None
+    }
+
+    private fun parseContentItem(json: String): ContentItem? {
+        return try {
+            val obj = JSONObject(json)
+            ContentItem(
+                id = obj.getString("id"),
+                title = obj.getString("title"),
+                description = obj.optString("description", null),
+                duration = obj.getDouble("duration"),
+                streamingUrl = obj.getString("streamingUrl"),
+                thumbnailUrl = obj.getString("thumbnailUrl"),
+                captionTracks = emptyList(),
+                customMetadata = null,
+                author = obj.optString("author", null),
+                articleUrl = obj.optString("articleUrl", null),
+                commentCount = if (obj.has("commentCount")) obj.getInt("commentCount") else null,
+            )
+        } catch (_: Exception) {
+            null
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.shortkit.reactnative
+
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+
+@ReactModule(name = ShortKitPlayerViewManager.REACT_CLASS)
+class ShortKitPlayerViewManager : SimpleViewManager<ShortKitPlayerNativeView>() {
+
+    override fun getName(): String = REACT_CLASS
+
+    override fun createViewInstance(context: ThemedReactContext): ShortKitPlayerNativeView {
+        return ShortKitPlayerNativeView(context)
+    }
+
+    @ReactProp(name = "config")
+    fun setConfig(view: ShortKitPlayerNativeView, config: String?) {
+        view.config = config
+    }
+
+    @ReactProp(name = "contentItem")
+    fun setContentItem(view: ShortKitPlayerNativeView, contentItem: String?) {
+        view.contentItem = contentItem
+    }
+
+    @ReactProp(name = "active", defaultBoolean = true)
+    fun setActive(view: ShortKitPlayerNativeView, active: Boolean) {
+        view.active = active
+    }
+
+    companion object {
+        const val REACT_CLASS = "ShortKitPlayerView"
+    }
+}

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

@@ -0,0 +1,133 @@
+package com.shortkit.reactnative
+
+import android.content.Context
+import android.widget.FrameLayout
+import com.shortkit.sdk.config.PlayerClickAction
+import com.shortkit.sdk.config.VideoOverlayMode
+import com.shortkit.sdk.config.WidgetConfig
+import com.shortkit.sdk.model.ContentItem
+import com.shortkit.sdk.widget.ShortKitWidgetView
+import org.json.JSONArray
+import org.json.JSONObject
+
+/**
+ * Fabric native view wrapping [ShortKitWidgetView] for use as a
+ * horizontal video carousel in React Native.
+ */
+class ShortKitWidgetNativeView(context: Context) : FrameLayout(context) {
+
+    private var widgetView: ShortKitWidgetView? = null
+    private var configJson: String? = null
+    private var itemsJson: String? = null
+
+    var config: String?
+        get() = configJson
+        set(value) {
+            if (value == configJson) return
+            configJson = value
+            rebuildIfNeeded()
+        }
+
+    var items: String?
+        get() = itemsJson
+        set(value) {
+            if (value == itemsJson) return
+            itemsJson = value
+            applyItems()
+        }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        rebuildIfNeeded()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+    }
+
+    private fun rebuildIfNeeded() {
+        if (widgetView != null) return
+
+        val sdk = ShortKitModule.shared?.sdk ?: return
+        val widgetConfig = parseWidgetConfig(configJson)
+
+        val view = ShortKitWidgetView(context).apply {
+            layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        }
+        view.initialize(sdk, widgetConfig)
+        addView(view)
+        widgetView = view
+
+        applyItems()
+    }
+
+    private fun applyItems() {
+        val json = itemsJson ?: return
+        val view = widgetView ?: return
+        val contentItems = parseContentItems(json) ?: return
+        view.configure(contentItems)
+    }
+
+    private fun parseWidgetConfig(json: String?): WidgetConfig {
+        if (json.isNullOrEmpty()) return WidgetConfig()
+        return try {
+            val obj = JSONObject(json)
+            WidgetConfig(
+                cardCount = obj.optInt("cardCount", 3),
+                cardSpacing = obj.optDouble("cardSpacing", 8.0).toFloat(),
+                cornerRadius = obj.optDouble("cornerRadius", 12.0).toFloat(),
+                autoplay = obj.optBoolean("autoplay", true),
+                muteOnStart = obj.optBoolean("muteOnStart", true),
+                loop = obj.optBoolean("loop", true),
+                rotationInterval = obj.optLong("rotationInterval", 10_000L),
+                clickAction = when (obj.optString("clickAction", "feed")) {
+                    "feed" -> PlayerClickAction.FEED
+                    "mute" -> PlayerClickAction.MUTE
+                    "none" -> PlayerClickAction.NONE
+                    else -> PlayerClickAction.FEED
+                },
+                cardOverlay = parseOverlay(obj),
+            )
+        } catch (_: Exception) {
+            WidgetConfig()
+        }
+    }
+
+    private fun parseOverlay(obj: JSONObject): VideoOverlayMode {
+        val overlay = obj.opt("overlay") ?: return VideoOverlayMode.None
+        if (overlay is JSONObject && overlay.optString("type") == "custom") {
+            return VideoOverlayMode.Custom {
+                ShortKitOverlayBridge(context)
+            }
+        }
+        return VideoOverlayMode.None
+    }
+
+    private fun parseContentItems(json: String): List<ContentItem>? {
+        return try {
+            val arr = JSONArray(json)
+            val items = mutableListOf<ContentItem>()
+            for (i in 0 until arr.length()) {
+                val obj = arr.getJSONObject(i)
+                items.add(
+                    ContentItem(
+                        id = obj.getString("id"),
+                        title = obj.getString("title"),
+                        description = obj.optString("description", null),
+                        duration = obj.getDouble("duration"),
+                        streamingUrl = obj.getString("streamingUrl"),
+                        thumbnailUrl = obj.getString("thumbnailUrl"),
+                        captionTracks = emptyList(),
+                        customMetadata = null,
+                        author = obj.optString("author", null),
+                        articleUrl = obj.optString("articleUrl", null),
+                        commentCount = if (obj.has("commentCount")) obj.getInt("commentCount") else null,
+                    )
+                )
+            }
+            items
+        } catch (_: Exception) {
+            null
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.shortkit.reactnative
+
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+
+@ReactModule(name = ShortKitWidgetViewManager.REACT_CLASS)
+class ShortKitWidgetViewManager : SimpleViewManager<ShortKitWidgetNativeView>() {
+
+    override fun getName(): String = REACT_CLASS
+
+    override fun createViewInstance(context: ThemedReactContext): ShortKitWidgetNativeView {
+        return ShortKitWidgetNativeView(context)
+    }
+
+    @ReactProp(name = "config")
+    fun setConfig(view: ShortKitWidgetNativeView, config: String?) {
+        view.config = config
+    }
+
+    @ReactProp(name = "items")
+    fun setItems(view: ShortKitWidgetNativeView, items: String?) {
+        view.items = items
+    }
+
+    companion object {
+        const val REACT_CLASS = "ShortKitWidgetView"
+    }
+}

package/ios/ShortKitBridge.swift

@@ -23,6 +23,7 @@ import ShortKit
     @objc public init(
         apiKey: String,
         config configJSON: String,
+        embedId: String?,
         clientAppName: String?,
         clientAppVersion: String?,
         customDimensions customDimensionsJSON: String?,
@@ -37,6 +38,7 @@ import ShortKit
         let sdk = ShortKit(
             apiKey: apiKey,
             config: feedConfig,
+            embedId: embedId,
             clientAppName: clientAppName,
             clientAppVersion: clientAppVersion,
             customDimensions: dimensions
@@ -46,6 +48,7 @@ import ShortKit
         ShortKitBridge.shared = self
 
         subscribeToPublishers(sdk.player)
+        sdk.delegate = self
     }
 
     // MARK: - Teardown
@@ -140,6 +143,35 @@ import ShortKit
         shortKit?.player.setMaxBitrate(Int(bitrate))
     }
 
+    // MARK: - Custom Feed
+
+    @objc public func setFeedItems(_ json: String) {
+        guard let items = Self.parseCustomFeedItems(json) else { return }
+        Task { @MainActor in
+            self.shortKit?.setFeedItems(items)
+        }
+    }
+
+    @objc public func appendFeedItems(_ json: String) {
+        guard let items = Self.parseCustomFeedItems(json) else { return }
+        Task { @MainActor in
+            self.shortKit?.appendFeedItems(items)
+        }
+    }
+
+    @objc public func fetchContent(_ limit: Int, completion: @escaping (String) -> Void) {
+        Task {
+            do {
+                let items = try await self.shortKit?.fetchContent(limit: limit) ?? []
+                let data = try JSONEncoder().encode(items)
+                let json = String(data: data, encoding: .utf8) ?? "[]"
+                completion(json)
+            } catch {
+                completion("[]")
+            }
+        }
+    }
+
     // MARK: - Combine Subscriptions
 
     private func subscribeToPublishers(_ player: ShortKitPlayer) {
@@ -277,6 +309,14 @@ import ShortKit
                 self?.emit("onPrefetchedAheadCountChanged", body: ["count": count])
             }
             .store(in: &cancellables)
+
+        // Remaining content count
+        player.remainingContentCount
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] count in
+                self?.emit("onRemainingContentCountChanged", body: ["count": count])
+            }
+            .store(in: &cancellables)
     }
 
     // MARK: - Event Emission Helpers
@@ -329,6 +369,10 @@ import ShortKit
             "thumbnailUrl": item.thumbnailUrl,
         ]
 
+        if let playbackId = item.playbackId {
+            dict["playbackId"] = playbackId
+        }
+
         if let description = item.description {
             dict["description"] = description
         }
@@ -410,13 +454,17 @@ import ShortKit
         let muteOnStart = obj["muteOnStart"] as? Bool ?? true
         let videoOverlay = parseVideoOverlay(obj["overlay"] as? String)
 
+        let feedSourceStr = obj["feedSource"] as? String ?? "algorithmic"
+        let feedSource: FeedSource = feedSourceStr == "custom" ? .custom : .algorithmic
+
         return FeedConfig(
             feedHeight: feedHeight,
             videoOverlay: videoOverlay,
             carouselOverlay: .none,
             surveyOverlay: .none,
             adOverlay: .none,
-            muteOnStart: muteOnStart
+            muteOnStart: muteOnStart,
+            feedSource: feedSource
         )
     }
 
@@ -472,6 +520,34 @@ import ShortKit
         }
     }
 
+    /// Parse a JSON string of CustomFeedItem[] from the JS bridge.
+    private static func parseCustomFeedItems(_ json: String) -> [CustomFeedItem]? {
+        guard let data = json.data(using: .utf8),
+              let arr = try? JSONSerialization.jsonObject(with: data) as? [[String: Any]] else {
+            return nil
+        }
+
+        var result: [CustomFeedItem] = []
+        for obj in arr {
+            guard let type = obj["type"] as? String else { continue }
+            switch type {
+            case "video":
+                guard let playbackId = obj["playbackId"] as? String else { continue }
+                result.append(.video(playbackId: playbackId))
+            case "imageCarousel":
+                guard let itemData = obj["item"],
+                      let itemJSON = try? JSONSerialization.data(withJSONObject: itemData),
+                      let carouselItem = try? JSONDecoder().decode(ImageCarouselItem.self, from: itemJSON) else {
+                    continue
+                }
+                result.append(.imageCarousel(carouselItem))
+            default:
+                continue
+            }
+        }
+        return result.isEmpty ? nil : result
+    }
+
     /// Parse optional custom dimensions JSON string into dictionary.
     private static func parseCustomDimensions(_ json: String?) -> [String: String]? {
         guard let json,
@@ -482,3 +558,14 @@ import ShortKit
         return dict
     }
 }
+
+// MARK: - ShortKitDelegate
+
+extension ShortKitBridge: ShortKitDelegate {
+    public func shortKit(_ shortKit: ShortKit, didTapContent contentId: String, at index: Int) {
+        emitOnMain("onContentTapped", body: [
+            "contentId": contentId,
+            "index": index
+        ])
+    }
+}