@5stones/react-native-audio-browser 0.2.0 → 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
@@ -65,7 +66,6 @@ import com.margelo.nitro.audiobrowser.PlayingState
 import com.margelo.nitro.audiobrowser.Progress
 import com.margelo.nitro.audiobrowser.RemoteJumpBackwardEvent
 import com.margelo.nitro.audiobrowser.RemoteJumpForwardEvent
-import com.margelo.nitro.audiobrowser.RemoteLoadEvent
 import com.margelo.nitro.audiobrowser.RemotePlayIdEvent
 import com.margelo.nitro.audiobrowser.RemotePlaySearchEvent
 import com.margelo.nitro.audiobrowser.RemoteSeekEvent
@@ -111,6 +111,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
       artwork = null,
       routes = null,
       singleTrack = null,
+      handleTrackLoad = null,
       androidControllerOfflineError = null,
       carPlayUpNextButton = null,
       carPlayNowPlayingButtons = null,
@@ -150,7 +151,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
   override var onRemoteJumpBackward: (RemoteJumpBackwardEvent) -> Unit = {}
   override var onRemoteJumpForward: (RemoteJumpForwardEvent) -> Unit = {}
   override var onRemoteLike: () -> Unit = {}
-  override var onRemoteLoad: (RemoteLoadEvent) -> Unit = {}
   override var onRemoteNext: () -> Unit = {}
   override var onRemotePause: () -> Unit = {}
   override var onChapterMetadata: (chapters: Array<ChapterMetadata>) -> Unit = {}
@@ -192,7 +192,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
   override var handleRemoteJumpBackward: ((RemoteJumpBackwardEvent) -> Unit)? = null
   override var handleRemoteJumpForward: ((RemoteJumpForwardEvent) -> Unit)? = null
   override var handleRemoteLike: (() -> Unit)? = null
-  override var handleRemoteLoad: ((RemoteLoadEvent) -> Unit)? = null
   override var handleRemoteNext: (() -> Unit)? = null
   override var handleRemotePause: (() -> Unit)? = null
   override var handleRemotePlay: (() -> Unit)? = null
@@ -507,24 +506,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
       }
   }
 
-  /**
-   * Centralizes handleRemoteLoad interception logic.
-   * If handleRemoteLoad is set, calls it (intercepted). Otherwise runs defaultBehavior.
-   * Always fires onRemoteLoad afterward.
-   *
-   * @return true if the handler intercepted, false if defaultBehavior ran
-   */
-  private fun handleLoad(
-    track: Track, queue: Array<Track>, startIndex: Double,
-    defaultBehavior: () -> Unit,
-  ): Boolean {
-    val event = RemoteLoadEvent(track, queue, startIndex)
-    val handled = handleRemoteLoad?.let { it.invoke(event); true } ?: false
-    if (!handled) defaultBehavior()
-    onRemoteLoad(event)
-    return handled
-  }
-
   override fun navigateTrack(track: Track) {
     clearNavigationError()
 
@@ -548,10 +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")
-                  handleLoad(track, player.tracks, index.toDouble()) {
+                  handleTrackLoad(_configuration.handleTrackLoad, track, player.tracks, index.toDouble(), intercepted = {}, defaultBehavior = {
                     player.skipTo(index)
                     player.play()
-                  }
+                  })
                   return@launch
                 }
               }
@@ -564,17 +545,17 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
                 Timber.d(
                   "Loading expanded queue: ${tracks.size} tracks, starting at index $startIndex"
                 )
-                handleLoad(track, tracks, startIndex.toDouble()) {
+                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")
-                handleLoad(track, arrayOf(track), 0.0) { player.load(track) }
+                handleTrackLoad(_configuration.handleTrackLoad, track, arrayOf(track), 0.0, intercepted = {}, defaultBehavior = { player.load(track) })
               }
             }
             // Navigate to browsable track to show browsing UI
@@ -585,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}")
-              handleLoad(track, arrayOf(track), 0.0) { 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

@@ -13,11 +13,11 @@ 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.RemoteLoadEvent
 import com.margelo.nitro.audiobrowser.Track
 import com.google.common.collect.ImmutableList
 import com.google.common.util.concurrent.Futures
@@ -454,24 +454,6 @@ class MediaSessionCallback(private val player: Player) :
     }
   }
 
-  /**
-   * Centralizes handleRemoteLoad interception logic for onSetMediaItems.
-   * If handleRemoteLoad is set, calls it and returns interceptedResult().
-   * Otherwise runs defaultBehavior(). Always fires onRemoteLoad afterward.
-   */
-  private suspend fun handleLoad(
-    audioBrowser: AudioBrowser,
-    track: Track, queue: Array<Track>, startIndex: Double,
-    interceptedResult: () -> MediaSession.MediaItemsWithStartPosition,
-    defaultBehavior: suspend () -> MediaSession.MediaItemsWithStartPosition,
-  ): MediaSession.MediaItemsWithStartPosition {
-    val event = RemoteLoadEvent(track, queue, startIndex)
-    val handler = audioBrowser.handleRemoteLoad
-    val result = if (handler != null) { handler(event); interceptedResult() } else defaultBehavior()
-    audioBrowser.onRemoteLoad(event)
-    return result
-  }
-
   override fun onSetMediaItems(
     mediaSession: MediaSession,
     controller: MediaSession.ControllerInfo,
@@ -510,7 +492,7 @@ class MediaSessionCallback(private val player: Player) :
             if (index >= 0) {
               Timber.d("Queue already from $parentPath, skipping to index $index")
               val track = player.tracks[index]
-              return@future handleLoad(audioBrowser, track, player.tracks, index.toDouble(), ::currentPlayerState) {
+              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(
@@ -531,7 +513,7 @@ class MediaSessionCallback(private val player: Player) :
       val tracks = result.mediaItems.map { TrackFactory.fromMedia3(it) }.toTypedArray()
       val selectedTrack = tracks.getOrElse(result.startIndex) { tracks.first() }
 
-      handleLoad(audioBrowser, selectedTrack, tracks, result.startIndex.toDouble(), ::currentPlayerState) {
+      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

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