@5stones/react-native-audio-browser 0.1.6 → 0.3.0

package/AudioBrowser.podspec

@@ -26,6 +26,8 @@ Pod::Spec.new do |s|
     "cpp/**/*.{hpp,cpp}",
   ]
 
+  s.exclude_files = ["ios/Tests/**/*"]
+
   # Public headers for CarPlay scene delegate
   s.public_header_files = ["ios/CarPlay/*.h"]
 
@@ -39,5 +41,5 @@ Pod::Spec.new do |s|
   install_modules_dependencies(s)
 
   # CarPlay framework for CarPlay support
-  s.frameworks = 'CarPlay'
+  s.frameworks = 'CarPlay', 'Intents'
 end

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,9 @@
 #include <jni.h>
+#include <fbjni/fbjni.h>
 #include "AudioBrowserOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::audiobrowser::initialize(vm);
+  return facebook::jni::initialize(vm, []() {
+    margelo::nitro::audiobrowser::registerAllNatives();
+  });
 }

package/android/src/main/java/com/audiobrowser/AudioBrowser.kt

@@ -15,6 +15,7 @@ import androidx.media3.session.MediaBrowser
 import androidx.media3.session.SessionToken
 import com.audiobrowser.browser.BrowserConfig
 import com.audiobrowser.browser.BrowserManager
+import com.audiobrowser.browser.handleTrackLoad
 import com.audiobrowser.browser.CallbackException
 import com.audiobrowser.browser.ContentNotFoundException
 import com.audiobrowser.browser.HttpStatusException
@@ -110,6 +111,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
       artwork = null,
       routes = null,
       singleTrack = null,
+      handleTrackLoad = null,
       androidControllerOfflineError = null,
       carPlayUpNextButton = null,
       carPlayNowPlayingButtons = null,
@@ -527,8 +529,10 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
                 val index = player.tracks.indexOfFirst { it.src == trackId }
                 if (index >= 0) {
                   Timber.d("Queue already from $parentPath, skipping to index $index")
-                  player.skipTo(index)
-                  player.play()
+                  handleTrackLoad(_configuration.handleTrackLoad, track, player.tracks, index.toDouble(), intercepted = {}, defaultBehavior = {
+                    player.skipTo(index)
+                    player.play()
+                  })
                   return@launch
                 }
               }
@@ -541,15 +545,17 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
                 Timber.d(
                   "Loading expanded queue: ${tracks.size} tracks, starting at index $startIndex"
                 )
-
-                // Replace queue and seek to selected track
-                // Use internal player methods directly to avoid blocking on main thread
-                player.setQueue(tracks, startIndex, sourcePath = parentPath)
-                player.play()
+                handleTrackLoad(_configuration.handleTrackLoad, track, tracks, startIndex.toDouble(), intercepted = {}, defaultBehavior = {
+                  // Replace queue and seek to selected track
+                  // Use internal player methods directly to avoid blocking on main thread
+                  player.setQueue(tracks, startIndex, sourcePath = parentPath)
+                  player.play()
+                })
+                return@launch
               } else {
                 // Fallback: just load the single track
                 Timber.w("Queue expansion failed, loading single track")
-                player.load(track)
+                handleTrackLoad(_configuration.handleTrackLoad, track, arrayOf(track), 0.0, intercepted = {}, defaultBehavior = { player.load(track) })
               }
             }
             // Navigate to browsable track to show browsing UI
@@ -560,7 +566,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
             // If track is playable (has src), load it into player
             track.src != null -> {
               Timber.d("Loading playable track into player: ${track.title}")
-              player.load(track)
+              handleTrackLoad(_configuration.handleTrackLoad, track, arrayOf(track), 0.0, intercepted = {}, defaultBehavior = { player.load(track) })
             }
             else -> {
               throw IllegalArgumentException("Track must have either an 'url' or an 'src' property")

package/android/src/main/java/com/audiobrowser/Service.kt

@@ -28,7 +28,6 @@ import com.audiobrowser.util.CoilBitmapLoader
 import com.margelo.nitro.audiobrowser.AppKilledPlaybackBehavior
 import com.margelo.nitro.audiobrowser.SearchMode
 import com.margelo.nitro.audiobrowser.SearchParams
-import kotlin.system.exitProcess
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
@@ -268,7 +267,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
             scope.cancel()
             stopForeground(STOP_FOREGROUND_REMOVE)
             stopSelf()
-            exitProcess(0)
           } catch (e: Exception) {
             Timber.e(e, "Error during aggressive cleanup in onTaskRemoved")
             // Still try to stop the service

package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt

@@ -163,6 +163,7 @@ class BrowserManager {
       favorited = true,
       groupTitle = track.groupTitle,
       live = track.live,
+      imageRow = track.imageRow,
     )
   }
 
@@ -743,6 +744,7 @@ class BrowserManager {
           url = searchPath,
           title = "Search: ${params.query}",
           children = searchResults,
+          carPlaySiriListButton = null,
           artwork = null,
           artworkSource = null,
           artworkCarPlayTinted = null,
@@ -758,6 +760,7 @@ class BrowserManager {
           favorited = null,
           groupTitle = null,
           live = null,
+          imageRow = null,
         )
 
       // Cache search results for getCachedSearchResults()
@@ -780,6 +783,7 @@ class BrowserManager {
           url = searchPath,
           title = "Search: ${params.query}",
           children = emptyArray(),
+          carPlaySiriListButton = null,
           artwork = null,
           artworkSource = null,
           artworkCarPlayTinted = null,
@@ -795,6 +799,7 @@ class BrowserManager {
           favorited = null,
           groupTitle = null,
           live = null,
+          imageRow = null,
         )
 
       return emptySearchResult

package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt

@@ -1,5 +1,7 @@
 package com.audiobrowser.browser
 
+import com.margelo.nitro.audiobrowser.CarPlaySiriListButtonPosition
+import com.margelo.nitro.audiobrowser.ImageRowItem
 import com.margelo.nitro.audiobrowser.ResolvedTrack
 import com.margelo.nitro.audiobrowser.Track
 import com.margelo.nitro.audiobrowser.TrackStyle
@@ -9,6 +11,13 @@ import kotlinx.serialization.Serializable
  * JSON serializable models for parsing API responses. These will be converted to Nitro types after
  * parsing.
  */
+@Serializable
+data class JsonImageRowItem(
+  val url: String? = null,
+  val artwork: String? = null,
+  val title: String,
+)
+
 @Serializable
 data class JsonResolvedTrack(
   val url: String,
@@ -27,6 +36,7 @@ data class JsonResolvedTrack(
   val childrenStyle: String? = null,
   val groupTitle: String? = null,
   val live: Boolean? = null,
+  val carPlaySiriListButton: String? = null,
 )
 
 @Serializable
@@ -46,6 +56,7 @@ data class JsonTrack(
   val childrenStyle: String? = null,
   val groupTitle: String? = null,
   val live: Boolean? = null,
+  val imageRow: List<JsonImageRowItem>? = null,
 )
 
 /** Convert JSON models to Nitro types */
@@ -57,10 +68,28 @@ private fun String?.toTrackStyle(): TrackStyle? {
   }
 }
 
+private fun String?.toCarPlaySiriListButtonPosition(): CarPlaySiriListButtonPosition? {
+  return when (this?.lowercase()) {
+    "top" -> CarPlaySiriListButtonPosition.TOP
+    "bottom" -> CarPlaySiriListButtonPosition.BOTTOM
+    else -> null
+  }
+}
+
+private fun JsonImageRowItem.toNitro(): ImageRowItem {
+  return ImageRowItem(
+    url = url,
+    artwork = artwork,
+    artworkSource = null,
+    title = title,
+  )
+}
+
 fun JsonResolvedTrack.toNitro(): ResolvedTrack {
   return ResolvedTrack(
     url = url,
     children = children?.map { it.toNitro() }?.toTypedArray(),
+    carPlaySiriListButton = carPlaySiriListButton.toCarPlaySiriListButtonPosition(),
     title = title,
     subtitle = subtitle,
     artwork = artwork,
@@ -77,6 +106,7 @@ fun JsonResolvedTrack.toNitro(): ResolvedTrack {
     favorited = null,
     groupTitle = groupTitle,
     live = live,
+    imageRow = null,
   )
 }
 
@@ -99,5 +129,6 @@ fun JsonTrack.toNitro(): Track {
     favorited = null,
     groupTitle = groupTitle,
     live = live,
+    imageRow = imageRow?.map { it.toNitro() }?.toTypedArray(),
   )
 }

package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt

@@ -61,12 +61,16 @@ class SimpleRouter {
         if (!matchSingleSegment(patternSegments[i], pathSegments[i], params)) {
           return null
         }
-        updateSegmentCounts(
-          patternSegments[i],
-          constantSegments,
-          parameterSegments,
-          wildcardSegments,
-        )
+        val (constCount, paramCount, wildcardCount) =
+          updateSegmentCounts(
+            patternSegments[i],
+            constantSegments,
+            parameterSegments,
+            wildcardSegments,
+          )
+        constantSegments = constCount
+        parameterSegments = paramCount
+        wildcardSegments = wildcardCount
       }
 
       // Capture remaining path segments as "tail" parameter

package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt

@@ -0,0 +1,45 @@
+package com.audiobrowser.browser
+
+import com.margelo.nitro.audiobrowser.TrackLoadEvent
+import com.margelo.nitro.audiobrowser.Track
+import com.margelo.nitro.core.Promise
+import timber.log.Timber
+
+/**
+ * Handles track load interception using the double-Promise pattern required by Nitro.
+ *
+ * If the handler is present, awaits it and returns [intercepted]. Otherwise runs [default].
+ *
+ * Nitro wraps value-returning JS callbacks in Promise<T> for thread safety, so a JS callback
+ * returning Promise<void> becomes Promise<Promise<Unit>> on the native side. Both layers
+ * must be awaited to properly wait for the JS work to complete.
+ *
+ * @param handler The handleTrackLoad callback from NativeBrowserConfiguration, or null
+ * @param track The track being loaded
+ * @param queue The resolved queue of tracks
+ * @param startIndex The index of the track in the queue
+ * @param intercepted Value to return when the handler is present and invoked
+ * @param defaultBehavior Value to return when no handler is configured
+ * @return Result of [intercepted] if handler was invoked, result of [defaultBehavior] otherwise
+ */
+suspend fun <T> handleTrackLoad(
+  handler: ((event: TrackLoadEvent) -> Promise<Promise<Unit>>)?,
+  track: Track,
+  queue: Array<Track>,
+  startIndex: Double,
+  intercepted: () -> T,
+  defaultBehavior: suspend () -> T,
+): T {
+  if (handler != null) {
+    val event = TrackLoadEvent(track, queue, startIndex)
+    try {
+      val outerPromise = handler(event)
+      val innerPromise = outerPromise.await()
+      innerPromise.await()
+    } catch (e: Exception) {
+      Timber.e(e, "handleTrackLoad failed")
+    }
+    return intercepted()
+  }
+  return defaultBehavior()
+}

package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt

@@ -12,10 +12,13 @@ import androidx.media3.session.MediaConstants
 import androidx.media3.session.SessionCommand
 import androidx.media3.session.SessionError
 import androidx.media3.session.SessionResult
+import com.audiobrowser.AudioBrowser
+import com.audiobrowser.browser.handleTrackLoad
 import com.audiobrowser.util.BrowserPathHelper
 import com.audiobrowser.util.RatingFactory
 import com.audiobrowser.util.ResolvedTrackFactory
 import com.audiobrowser.util.TrackFactory
+import com.margelo.nitro.audiobrowser.Track
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
@@ -463,6 +466,19 @@ class MediaSessionCallback(private val player: Player) :
     )
 
     return scope.future {
+      val audioBrowser = player.awaitBrowser()
+
+      // Helper: returns the current player state unchanged so Media3 doesn't modify playback
+      fun currentPlayerState(): MediaSession.MediaItemsWithStartPosition {
+        val currentItems = player.tracks.map { TrackFactory.toMedia3(it) }
+        val currentIndex = player.currentIndex ?: 0
+        return MediaSession.MediaItemsWithStartPosition(
+          currentItems,
+          currentIndex,
+          startPositionMs,
+        )
+      }
+
       // Check if this is a single contextual URL that matches the current queue source
       if (mediaItems.size == 1) {
         val mediaId = mediaItems[0].mediaId
@@ -475,33 +491,39 @@ class MediaSessionCallback(private val player: Player) :
             val index = player.tracks.indexOfFirst { it.src == trackId }
             if (index >= 0) {
               Timber.d("Queue already from $parentPath, skipping to index $index")
-              // Return the existing queue items with the new start index
-              val existingItems = player.tracks.map { TrackFactory.toMedia3(it) }
-              return@future MediaSession.MediaItemsWithStartPosition(
-                existingItems,
-                index,
-                startPositionMs,
-              )
+              val track = player.tracks[index]
+              return@future handleTrackLoad(audioBrowser.configuration.handleTrackLoad, track, player.tracks, index.toDouble(), ::currentPlayerState) {
+                // Return the existing queue items with the new start index
+                val existingItems = player.tracks.map { TrackFactory.toMedia3(it) }
+                MediaSession.MediaItemsWithStartPosition(
+                  existingItems,
+                  index,
+                  startPositionMs,
+                )
+              }
             }
           }
         }
       }
 
-      // Wait for browser to be registered if it's not available yet
-      val browserManager = player.awaitBrowser().browserManager
+      val browserManager = audioBrowser.browserManager
       val result =
         browserManager.resolveMediaItemsForPlayback(mediaItems, startIndex, startPositionMs)
 
-      // If this was a contextual URL expansion, track the source path
-      if (mediaItems.size == 1) {
-        val mediaId = mediaItems[0].mediaId
-        if (BrowserPathHelper.isContextual(mediaId)) {
-          val parentPath = BrowserPathHelper.stripTrackId(mediaId)
-          withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
+      val tracks = result.mediaItems.map { TrackFactory.fromMedia3(it) }.toTypedArray()
+      val selectedTrack = tracks.getOrElse(result.startIndex) { tracks.first() }
+
+      handleTrackLoad(audioBrowser.configuration.handleTrackLoad, selectedTrack, tracks, result.startIndex.toDouble(), ::currentPlayerState) {
+        // If this was a contextual URL expansion, track the source path (only for default behavior)
+        if (mediaItems.size == 1) {
+          val mediaId = mediaItems[0].mediaId
+          if (BrowserPathHelper.isContextual(mediaId)) {
+            val parentPath = BrowserPathHelper.stripTrackId(mediaId)
+            withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
+          }
         }
+        result
       }
-
-      result
     }
   }
 

package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt

@@ -189,6 +189,7 @@ class PlaybackStateStore(private val player: Player) {
             else null,
           groupTitle = obj.optString("groupTitle").takeIf { it.isNotEmpty() },
           live = if (obj.has("live") && !obj.isNull("live")) obj.getBoolean("live") else null,
+          imageRow = null, // Not persisted
         )
       }
       .onFailure { e -> Timber.w(e, "Failed to parse persisted track JSON") }

package/android/src/main/java/com/audiobrowser/player/Player.kt

@@ -832,6 +832,7 @@ class Player(internal val context: Context) {
         favorited = favorited,
         groupTitle = currentTrack.groupTitle,
         live = currentTrack.live,
+        imageRow = currentTrack.imageRow,
       )
 
     // Use buildUpon() on the existing MediaItem to update only the metadata

package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt

@@ -17,10 +17,14 @@ import timber.log.Timber
  * needs to fetch data. By deferring URL transformation (which may invoke a JS callback
  * via `runBlocking`) to [open], we avoid blocking the main thread and prevent deadlocks
  * when the JS thread is occupied by synchronous Nitro calls (e.g., `seekTo`).
+ *
+ * The transform is resolved once per track on the first [open] call (the manifest/media
+ * URL). The resulting headers and user-agent are cached on the [Factory] and reused for
+ * subsequent requests (segments, encryption keys) without calling the JS transform again.
  */
 class TransformingDataSource(
   private val upstream: DataSource,
-  private val getRequestConfig: (originalUrl: String) -> MediaRequestConfig?,
+  private val factory: Factory,
 ) : DataSource {
 
   companion object {
@@ -32,11 +36,19 @@ class TransformingDataSource(
   override fun open(dataSpec: DataSpec): Long {
     val originalUrl = dataSpec.uri.toString()
 
-    // Resolve the transform on the IO thread — safe to block here since
-    // the main thread and JS thread remain free for other work.
-    val (finalUrl, headers, userAgent) = resolveRequestConfig(originalUrl)
-
-    Timber.d("TransformingDataSource: $originalUrl -> $finalUrl")
+    // Check if the Factory already has a cached transform result.
+    // The first DataSource to open() resolves the transform and caches it.
+    // All subsequent opens (segments, keys, replays) reuse the cached
+    // headers/user-agent but keep their original URLs.
+    val cached = factory.cachedTransform
+    val (finalUrl, headers, userAgent) = if (cached == null) {
+      val resolved = resolveRequestConfig(originalUrl)
+      factory.cachedTransform = resolved
+      Timber.d("TransformingDataSource: resolved $originalUrl -> ${resolved.first}")
+      resolved
+    } else {
+      Triple(originalUrl, cached.second, cached.third)
+    }
 
     // Build merged headers including user-agent override
     val mergedHeaders = buildMap {
@@ -47,7 +59,7 @@ class TransformingDataSource(
       }
     }
 
-    // Build a new DataSpec with the transformed URL and merged headers
+    // Build a new DataSpec with the (possibly transformed) URL and merged headers
     val transformedSpec =
       dataSpec.buildUpon().setUri(finalUrl.toUri()).setHttpRequestHeaders(mergedHeaders).build()
 
@@ -82,7 +94,7 @@ class TransformingDataSource(
     originalUrl: String
   ): Triple<String, Map<String, String>, String> {
     return try {
-      val requestConfig = getRequestConfig(originalUrl)
+      val requestConfig = factory.getRequestConfig(originalUrl)
       if (requestConfig != null) {
         val path = requestConfig.path ?: ""
         val baseUrl = requestConfig.baseUrl
@@ -91,7 +103,7 @@ class TransformingDataSource(
         val finalUrl =
           if (requestConfig.query?.isNotEmpty() == true) {
             val uri = Uri.parse(url).buildUpon()
-            requestConfig.query!!.forEach { (key, value) -> uri.appendQueryParameter(key, value) }
+            requestConfig.query?.forEach { (key, value) -> uri.appendQueryParameter(key, value) }
             uri.build().toString()
           } else {
             url
@@ -113,12 +125,22 @@ class TransformingDataSource(
   /** Factory that creates [TransformingDataSource] instances wrapping an upstream factory. */
   class Factory(
     private val upstreamFactory: DataSource.Factory,
-    private val getRequestConfig: (originalUrl: String) -> MediaRequestConfig?,
+    internal val getRequestConfig: (originalUrl: String) -> MediaRequestConfig?,
   ) : DataSource.Factory {
+
+    /**
+     * Cached transform result (url, headers, userAgent) from the first open() call.
+     * Shared across all DataSource instances created by this factory.
+     * A new Factory is created per [MediaFactory.createMediaSource] call (per track),
+     * so the cache naturally resets on track transitions.
+     */
+    @Volatile
+    internal var cachedTransform: Triple<String, Map<String, String>, String>? = null
+
     override fun createDataSource(): DataSource {
       return TransformingDataSource(
         upstream = upstreamFactory.createDataSource(),
-        getRequestConfig = getRequestConfig,
+        factory = this,
       )
     }
   }