react-native-audio-browser 0.2.0-next.9 → 0.2.0

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

@@ -4,7 +4,6 @@ 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.TrackRequest
 import com.margelo.nitro.audiobrowser.TrackStyle
 import kotlinx.serialization.Serializable
 
@@ -14,38 +13,19 @@ import kotlinx.serialization.Serializable
  */
 @Serializable
 data class JsonImageRowItem(
-  val id: String? = null,
   val url: String? = null,
-  val src: String? = null,
   val artwork: String? = null,
   val title: String,
-  val artist: String? = null,
-  val album: String? = null,
-  val albumUrl: String? = null,
-  val live: Boolean? = null,
-  val request: JsonTrackRequest? = null,
 )
 
-/** JSON model for a track's per-request HTTP override (identity/auth/signed-url). */
-@Serializable
-data class JsonTrackRequest(
-  val userAgent: String? = null,
-  val headers: Map<String, String>? = null,
-  val query: Map<String, String>? = null,
-) {
-  fun toNitro(): TrackRequest = TrackRequest(userAgent, headers, query)
-}
-
 @Serializable
 data class JsonResolvedTrack(
-  val id: String? = null,
   val url: String,
   val title: String,
   val subtitle: String? = null,
   val icon: String? = null,
-  val artwork: JsonArtwork? = null,
+  val artwork: String? = null,
   val artist: String? = null,
-  val albumUrl: String? = null,
   val album: String? = null,
   val description: String? = null,
   val genre: String? = null,
@@ -61,20 +41,17 @@ data class JsonResolvedTrack(
 
 @Serializable
 data class JsonTrack(
-  val id: String? = null,
   val url: String? = null,
   val title: String,
   val subtitle: String? = null,
   val icon: String? = null,
-  val artwork: JsonArtwork? = null,
+  val artwork: String? = null,
   val artist: String? = null,
-  val albumUrl: String? = null,
   val album: String? = null,
   val description: String? = null,
   val genre: String? = null,
   val duration: Double? = null,
   val src: String? = null,
-  val request: JsonTrackRequest? = null,
   val style: String? = null,
   val childrenStyle: String? = null,
   val groupTitle: String? = null,
@@ -101,35 +78,24 @@ private fun String?.toCarPlaySiriListButtonPosition(): CarPlaySiriListButtonPosi
 
 private fun JsonImageRowItem.toNitro(): ImageRowItem {
   return ImageRowItem(
-    id = id,
     url = url,
-    src = src,
     artwork = artwork,
     artworkSource = null,
     title = title,
-    artist = artist,
-    album = album,
-    albumUrl = albumUrl,
-    live = live,
-    request = request?.toNitro(),
   )
 }
 
 fun JsonResolvedTrack.toNitro(): ResolvedTrack {
   return ResolvedTrack(
-    id = id,
     url = url,
     children = children?.map { it.toNitro() }?.toTypedArray(),
     carPlaySiriListButton = carPlaySiriListButton.toCarPlaySiriListButtonPosition(),
     title = title,
     subtitle = subtitle,
-    artwork = artwork?.toNitro(),
+    artwork = artwork,
     artworkSource = null,
-    // Containers carry no per-track media-request override (mirrors iOS JsonResolvedTrack).
-    request = null,
     artworkCarPlayTinted = null,
     artist = artist,
-    albumUrl = albumUrl,
     album = album,
     description = description,
     genre = genre,
@@ -146,16 +112,13 @@ fun JsonResolvedTrack.toNitro(): ResolvedTrack {
 
 fun JsonTrack.toNitro(): Track {
   return Track(
-    id = id,
     url = url,
     title = title,
     subtitle = subtitle,
-    artwork = artwork?.toNitro(),
+    artwork = artwork,
     artworkSource = null,
-    request = request?.toNitro(),
     artworkCarPlayTinted = null,
     artist = artist,
-    albumUrl = albumUrl,
     album = album,
     description = description,
     genre = genre,

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

@@ -1,7 +1,7 @@
 package com.audiobrowser.browser
 
-import com.margelo.nitro.audiobrowser.Track
 import com.margelo.nitro.audiobrowser.TrackLoadEvent
+import com.margelo.nitro.audiobrowser.Track
 import com.margelo.nitro.core.Promise
 import timber.log.Timber
 
@@ -11,8 +11,8 @@ import timber.log.Timber
  * 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.
+ * 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
@@ -27,7 +27,7 @@ suspend fun <T> handleTrackLoad(
   track: Track,
   queue: Array<Track>,
   startIndex: Double,
-  intercepted: suspend () -> T,
+  intercepted: () -> T,
   defaultBehavior: suspend () -> T,
 ): T {
   if (handler != null) {

package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt

@@ -2,11 +2,11 @@ package com.audiobrowser.http
 
 import com.audiobrowser.util.BrowserPathHelper
 import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
+import com.margelo.nitro.audiobrowser.ImageContext
 import com.margelo.nitro.audiobrowser.MediaRequestConfig
+import com.margelo.nitro.audiobrowser.MediaTransformParams
 import com.margelo.nitro.audiobrowser.RequestConfig
-import com.margelo.nitro.audiobrowser.Track
 import com.margelo.nitro.audiobrowser.TransformableRequestConfig
-import com.margelo.nitro.core.Promise
 import java.net.URLEncoder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -43,49 +43,6 @@ object RequestConfigBuilder {
     )
   }
 
-  /**
-   * Run-both resolve composition: the async-resolved config first, then the sync-resolved merged
-   * over it (sync winning). Returns null when neither produced a config. Extracted so the merge
-   * ordering is unit-testable without Nitro callbacks; used by [applyMediaResolve] and the artwork
-   * resolve in BrowserUrlResolution.
-   */
-  fun composeResolved(asyncResolved: RequestConfig?, syncResolved: RequestConfig?): RequestConfig? {
-    return when {
-      asyncResolved == null -> syncResolved
-      syncResolved == null -> asyncResolved
-      else -> mergeConfig(asyncResolved, syncResolved)
-    }
-  }
-
-  /**
-   * Awaits an **async** config callback. It lowers to `Promise<Promise<RequestConfig>>` (bridge hop
-   * → JS promise), so it is a DOUBLE await. That depth is the bug-prone part (single-awaiting an
-   * async callback hands a `Promise` downstream — the original "empty config" bug), so it lives in
-   * exactly one place. Pairs with [awaitSyncConfig].
-   */
-  suspend fun awaitAsyncConfig(promise: Promise<Promise<RequestConfig>>): RequestConfig =
-    promise.await().await()
-
-  /** Awaits a **sync** config callback (`Promise<RequestConfig>` — a single await). */
-  suspend fun awaitSyncConfig(promise: Promise<RequestConfig>): RequestConfig = promise.await()
-
-  /** Rebuilds a [MediaRequestConfig] with [c]'s request fields, preserving callbacks. */
-  private fun MediaRequestConfig.withRequestFields(c: RequestConfig) =
-    MediaRequestConfig(
-      resolve = resolve,
-      resolveSync = resolveSync,
-      transform = transform,
-      transformSync = transformSync,
-      method = c.method,
-      path = c.path,
-      baseUrl = c.baseUrl,
-      headers = c.headers,
-      query = c.query,
-      body = c.body,
-      contentType = c.contentType,
-      userAgent = c.userAgent,
-    )
-
   suspend fun mergeConfig(
     base: RequestConfig,
     override: TransformableRequestConfig,
@@ -93,86 +50,117 @@ object RequestConfigBuilder {
     return mergeConfig(base, override, emptyMap())
   }
 
-  /**
-   * Request-Config Layer application: a transform (async and/or sync) wins completely — with both
-   * set they run as a pipeline, async first, then sync, each replacing the running config —
-   * otherwise the override's static fields merge over the base, EXCEPT `path`, which is carried
-   * from the base (only a transform may change it; mirrors iOS `applyLayer` and the web stub). A
-   * thrown transform falls back to the base.
-   */
   suspend fun mergeConfig(
     base: RequestConfig,
     override: TransformableRequestConfig,
     routeParams: Map<String, String>? = null,
   ): RequestConfig {
-    if (override.transform == null && override.transformSync == null) {
-      return mergeConfig(base, toRequestConfig(override)).copy(path = base.path)
-    }
-    return try {
-      // Async first, then sync (each replaces the running config). The bridge await
-      // depth is centralised in awaitAsync/SyncConfig.
-      var result = base
-      override.transform?.let { result = awaitAsyncConfig(it.invoke(result, routeParams)) }
-      override.transformSync?.let { result = awaitSyncConfig(it.invoke(result, routeParams)) }
-      result
-    } catch (e: Exception) {
-      Timber.e(e, "Failed to apply transform function, using base config")
-      base
-    }
+    // Apply transform function if provided
+    return override.transform?.let { transformFn ->
+      try {
+        transformFn.invoke(base, routeParams).await().await() // Transform result wins completely
+      } catch (e: Exception) {
+        Timber.e(e, "Failed to apply transform function, using base config")
+        base
+      }
+    } ?: mergeConfig(base, toRequestConfig(override)) // Only merge if no transform
   }
 
-  /**
-   * Media-kind layer application. A media config's transform/transformSync have the same shape as a
-   * [TransformableRequestConfig]'s, so this delegates to the layer overload above and rewraps — the
-   * layer semantics live in one place.
-   */
   suspend fun mergeConfig(
     base: RequestConfig,
     override: MediaRequestConfig,
     routeParams: Map<String, String>? = null,
-  ): MediaRequestConfig =
-    override.withRequestFields(mergeConfig(base, override.asTransformable(), routeParams))
-
-  private fun MediaRequestConfig.asTransformable() =
-    TransformableRequestConfig(
-      transform = transform,
-      transformSync = transformSync,
-      method = method,
-      path = path,
-      baseUrl = baseUrl,
-      headers = headers,
-      query = query,
-      body = body,
-      contentType = contentType,
-      userAgent = userAgent,
+  ): MediaRequestConfig {
+    // Apply transform function if provided - transform result wins completely
+    val finalConfig: RequestConfig =
+      override.transform?.let { transformFn ->
+        try {
+          Timber.d("Invoking media transform for URL: ${base.path}")
+          val transformed = transformFn.invoke(base, routeParams).await().await()
+          Timber.d(
+            "Media transform result: path=${transformed.path}, baseUrl=${transformed.baseUrl}, headers=${transformed.headers}, userAgent=${transformed.userAgent}"
+          )
+          transformed
+        } catch (e: Exception) {
+          Timber.e(e, "Failed to apply media transform function, using base config")
+          base
+        }
+      }
+        ?: RequestConfig(
+          path = override.path ?: base.path,
+          method = override.method ?: base.method,
+          baseUrl = override.baseUrl ?: base.baseUrl,
+          headers = mergeHeaders(base.headers, override.headers),
+          query = mergeQuery(base.query, override.query),
+          body = override.body ?: base.body,
+          contentType = override.contentType ?: base.contentType,
+          userAgent = override.userAgent ?: base.userAgent,
+        )
+
+    // Wrap the final RequestConfig in MediaRequestConfig to preserve resolve callback
+    return MediaRequestConfig(
+      resolve = override.resolve,
+      transform = override.transform,
+      method = finalConfig.method,
+      path = finalConfig.path,
+      baseUrl = finalConfig.baseUrl,
+      headers = finalConfig.headers,
+      query = finalConfig.query,
+      body = finalConfig.body,
+      contentType = finalConfig.contentType,
+      userAgent = finalConfig.userAgent,
     )
+  }
 
   /**
-   * Applies the per-track `media.resolve(track)` callback as the final, most-specific layer over an
-   * already request+media-layered config. The callback receives the full Track — carrying any
-   * per-track `request` override (e.g. a strict-UA sentinel the consumer swaps for a clean
-   * User-Agent) — and returns the config whose fields win.
-   *
-   * No-op when the media config has no `resolve` callback or no track is available (so the
-   * request/media layers stand). The callback may return its config synchronously (variant `first`)
-   * or via a Promise (`second`). Mirrors iOS resolveMediaTrackConfig + applyMediaResolveLayer.
+   * Merges artwork request config with base config, applying transform with ImageContext.
+   * Used for artwork URL transformation where size hints are needed.
    */
-  suspend fun applyMediaResolve(layered: MediaRequestConfig, track: Track?): MediaRequestConfig {
-    if (track == null) return layered
-    if (layered.resolve == null && layered.resolveSync == null) return layered
-    val resolved: RequestConfig =
-      try {
-        // Async first, then sync (merged, sync winning) — via the tested helper.
-        val asyncResolved = layered.resolve?.let { awaitAsyncConfig(it.invoke(track)) }
-        val syncResolved = layered.resolveSync?.let { awaitSyncConfig(it.invoke(track)) }
-        composeResolved(asyncResolved, syncResolved) ?: return layered
-      } catch (e: Exception) {
-        Timber.e(e, "Failed to apply media.resolve, using layered config")
-        return layered
+  suspend fun mergeConfig(
+    base: RequestConfig,
+    override: ArtworkRequestConfig,
+    imageContext: ImageContext? = null,
+  ): ArtworkRequestConfig {
+    // Apply transform function if provided - transform result wins completely
+    val finalConfig: RequestConfig =
+      override.transform?.let { transformFn ->
+        try {
+          Timber.d("Invoking artwork transform for URL: ${base.path}")
+          val transformed = transformFn.invoke(MediaTransformParams(base, imageContext)).await().await()
+          Timber.d(
+            "Artwork transform result: path=${transformed.path}, baseUrl=${transformed.baseUrl}, headers=${transformed.headers}, userAgent=${transformed.userAgent}"
+          )
+          transformed
+        } catch (e: Exception) {
+          Timber.e(e, "Failed to apply artwork transform function, using base config")
+          base
+        }
       }
-    // Resolve wins: merge it over the layered config (override-wins on every field).
-    val merged = mergeConfig(toRequestConfig(layered), resolved)
-    return layered.withRequestFields(merged)
+        ?: RequestConfig(
+          path = override.path ?: base.path,
+          method = override.method ?: base.method,
+          baseUrl = override.baseUrl ?: base.baseUrl,
+          headers = mergeHeaders(base.headers, override.headers),
+          query = mergeQuery(base.query, override.query),
+          body = override.body ?: base.body,
+          contentType = override.contentType ?: base.contentType,
+          userAgent = override.userAgent ?: base.userAgent,
+        )
+
+    // Wrap the final RequestConfig in ArtworkRequestConfig to preserve callbacks and query params
+    return ArtworkRequestConfig(
+      resolve = override.resolve,
+      transform = override.transform,
+      imageQueryParams = override.imageQueryParams,
+      method = finalConfig.method,
+      path = finalConfig.path,
+      baseUrl = finalConfig.baseUrl,
+      headers = finalConfig.headers,
+      query = finalConfig.query,
+      body = finalConfig.body,
+      contentType = finalConfig.contentType,
+      userAgent = finalConfig.userAgent,
+    )
   }
 
   fun toRequestConfig(artworkConfig: ArtworkRequestConfig): RequestConfig {

package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt

@@ -14,14 +14,12 @@ data class PlaybackMetadata(
 ) {
   companion object {
     /**
-     * Creates PlaybackMetadata from raw Metadata entries. Handles ICY streams specially, uses
-     * Media3's unified approach for everything else.
+     * Creates PlaybackMetadata from raw Metadata entries.
+     * Handles ICY streams specially, uses Media3's unified approach for everything else.
      */
     fun from(metadata: Metadata): PlaybackMetadata? {
       // Try ICY first (streaming-specific)
-      fromIcy(metadata)?.let {
-        return it
-      }
+      fromIcy(metadata)?.let { return it }
 
       // Use Media3's unified approach for ID3, Vorbis, QuickTime, etc.
       val builder = MediaMetadata.Builder()
@@ -71,6 +69,12 @@ data class PlaybackMetadata(
   }
 
   fun toNitro(): TimedMetadata {
-    return TimedMetadata(title = title, artist = artist, album = album, date = date, genre = genre)
+    return TimedMetadata(
+      title = title,
+      artist = artist,
+      album = album,
+      date = date,
+      genre = genre,
+    )
   }
 }

package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt

@@ -3,8 +3,7 @@ package com.audiobrowser.model
 import androidx.media3.exoplayer.DefaultLoadControl
 import com.margelo.nitro.audiobrowser.AndroidAudioContentType
 import com.margelo.nitro.audiobrowser.AndroidPlayerWakeMode
-import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams as NowPlayingFormatter
-import com.margelo.nitro.audiobrowser.NativeSetupPlayerOptions
+import com.margelo.nitro.audiobrowser.PartialSetupPlayerOptions
 import com.margelo.nitro.audiobrowser.Variant_Boolean_AndroidAudioOffloadSettings
 import com.margelo.nitro.audiobrowser.Variant_Boolean_RetryConfig
 
@@ -23,17 +22,10 @@ sealed class RetryPolicy {
   data object Default : RetryPolicy()
 
   /** Retry indefinitely with exponential backoff */
-  data class Infinite(
-    val maxRetryDurationMs: Long? = null,
-    val firstConnectMaxRetryDurationMs: Long? = null,
-  ) : RetryPolicy()
+  data class Infinite(val maxRetryDurationMs: Long? = null) : RetryPolicy()
 
   /** Retry up to maxRetries times with exponential backoff */
-  data class Limited(
-    val maxRetries: Int,
-    val maxRetryDurationMs: Long? = null,
-    val firstConnectMaxRetryDurationMs: Long? = null,
-  ) : RetryPolicy()
+  data class Limited(val maxRetries: Int, val maxRetryDurationMs: Long? = null) : RetryPolicy()
 }
 
 /**
@@ -53,15 +45,6 @@ data class PlayerSetupOptions(
   var wakeMode: AndroidPlayerWakeMode = AndroidPlayerWakeMode.NONE,
   var audioOffload: AudioOffloadOptions? = null,
   var retryPolicy: RetryPolicy = RetryPolicy.Default,
-  // Keep the media session alive & controllable through a terminal playback error so external
-  // controllers (Android Auto) keep their transport controls instead of tearing the session down.
-  // Default on: matches iOS, where the session always survives errors.
-  var keepSessionAliveOnError: Boolean = true,
-  // Whether the player publishes/refreshes track metadata on the now-playing surface.
-  var autoUpdateNowPlayingMetadata: Boolean = true,
-  // Optional JS formatter that customizes the now-playing title/subtitle from the track + live
-  // timed metadata. When null, the default mapping is used.
-  var nowPlayingMetadataFormatter: NowPlayingFormatter? = null,
 ) {
   /**
    * Whether automatic buffer management is enabled. True when rebufferBuffer is not explicitly set
@@ -70,7 +53,7 @@ data class PlayerSetupOptions(
   val automaticBuffer: Boolean
     get() = rebufferBuffer == null
 
-  fun update(options: NativeSetupPlayerOptions) {
+  fun update(options: PartialSetupPlayerOptions) {
     // Android-specific options
     options.android?.let { android ->
       android.minBuffer?.let { minBuffer = it }
@@ -107,27 +90,12 @@ data class PlayerSetupOptions(
             if (it.value) RetryPolicy.Infinite() else RetryPolicy.Default
           }
           is Variant_Boolean_RetryConfig.Second -> {
-            val maxRetries = it.value.maxRetries?.toInt()
-            val maxDurationMs = it.value.maxRetryDurationMs?.toLong()
-            val firstConnectMs = it.value.firstConnectMaxRetryDurationMs?.toLong()
-            // No attempt cap = retry indefinitely, bounded only by the durations.
-            if (maxRetries == null)
-              RetryPolicy.Infinite(
-                maxRetryDurationMs = maxDurationMs,
-                firstConnectMaxRetryDurationMs = firstConnectMs,
-              )
-            else
-              RetryPolicy.Limited(
-                maxRetries = maxRetries,
-                maxRetryDurationMs = maxDurationMs,
-                firstConnectMaxRetryDurationMs = firstConnectMs,
-              )
+            RetryPolicy.Limited(
+              maxRetries = it.value.maxRetries.toInt(),
+              maxRetryDurationMs = it.value.maxRetryDurationMs?.toLong(),
+            )
           }
         }
     }
-
-    options.keepSessionAliveOnError?.let { keepSessionAliveOnError = it }
-    options.autoUpdateNowPlayingMetadata?.let { autoUpdateNowPlayingMetadata = it }
-    options.nowPlayingMetadataFormatter?.let { nowPlayingMetadataFormatter = it }
   }
 }

package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt

@@ -1,13 +1,14 @@
 package com.audiobrowser.model
 
-import com.margelo.nitro.audiobrowser.AndroidOptions
+import com.margelo.nitro.audiobrowser.AndroidUpdateOptions
 import com.margelo.nitro.audiobrowser.AppKilledPlaybackBehavior
 import com.margelo.nitro.audiobrowser.NativeUpdateOptions
-import com.margelo.nitro.audiobrowser.Options
+import com.margelo.nitro.audiobrowser.NotificationButtonLayout
 import com.margelo.nitro.audiobrowser.PlayerCapabilities
-import com.margelo.nitro.audiobrowser.RemoteButtonLayout
+import com.margelo.nitro.audiobrowser.RatingType as NitroRatingType
+import com.margelo.nitro.audiobrowser.UpdateOptions
 import com.margelo.nitro.audiobrowser.Variant_NullType_Double
-import com.margelo.nitro.audiobrowser.Variant_NullType_RemoteButtonLayout
+import com.margelo.nitro.audiobrowser.Variant_NullType_NotificationButtonLayout
 
 /**
  * Update options for the AudioBrowser that can be changed at runtime. These options control player
@@ -21,29 +22,23 @@ data class PlayerUpdateOptions(
 
   // Player capabilities - most enabled by default, only false values disable
   // Exceptions: bookmark, jumpForward, jumpBackward default to false
-  var capabilities: PlayerCapabilities =
-    PlayerCapabilities(
-      play = null,
-      pause = null,
-      stop = null,
-      seekTo = null,
-      skipToNext = null,
-      skipToPrevious = null,
-      jumpForward = false,
-      jumpBackward = false,
-      favorite = null,
-      shuffleMode = null,
-      repeatMode = null,
-      playbackRate = null,
-    ),
+  var capabilities: PlayerCapabilities = PlayerCapabilities(
+    play = null, pause = null, stop = null, seekTo = null,
+    skipToNext = null, skipToPrevious = null,
+    jumpForward = false, jumpBackward = false,
+    favorite = null,
+    shuffleMode = null, repeatMode = null, playbackRate = null
+  ),
 
-  // Ordered button layout (null = derive from capabilities)
-  var remoteButtonLayout: RemoteButtonLayout? = null,
+  // Notification button layout (null = derive from capabilities)
+  var notificationButtons: NotificationButtonLayout? = null,
 
   // Android-specific runtime options (all under android.* in JS)
+  var ratingType: NitroRatingType? = null,
   var appKilledPlaybackBehavior: AppKilledPlaybackBehavior =
     AppKilledPlaybackBehavior.STOP_PLAYBACK_AND_REMOVE_NOTIFICATION,
   var skipSilence: Boolean = false,
+  var shuffle: Boolean = false,
 ) {
   fun updateFromBridge(options: NativeUpdateOptions) {
     options.forwardJumpInterval?.let { forwardJumpInterval = it }
@@ -57,49 +52,60 @@ data class PlayerUpdateOptions(
         }
     }
 
-    options.capabilities?.let { newCaps -> capabilities = mergeCapabilities(capabilities, newCaps) }
+    options.capabilities?.let { newCaps ->
+      capabilities = mergeCapabilities(capabilities, newCaps)
+    }
 
     // Update Android-specific options
     options.android?.let { androidOptions ->
+      // Convert rating type
+      androidOptions.ratingType?.let { ratingType = it }
+
       androidOptions.appKilledPlaybackBehavior?.let { appKilledPlaybackBehavior = it }
 
       // Update boolean options
       androidOptions.skipSilence?.let { skipSilence = it }
 
-      // Handle remoteButtonLayout - variant allows distinguishing undefined from null
-      androidOptions.remoteButtonLayout?.let { variant ->
-        remoteButtonLayout =
+      androidOptions.shuffle?.let { shuffle = it }
+
+      // Handle notificationButtons - variant allows distinguishing undefined from null
+      androidOptions.notificationButtons?.let { variant ->
+        notificationButtons =
           when (variant) {
-            is Variant_NullType_RemoteButtonLayout.First -> null
-            is Variant_NullType_RemoteButtonLayout.Second -> variant.value
+            is Variant_NullType_NotificationButtonLayout.First -> null
+            is Variant_NullType_NotificationButtonLayout.Second -> variant.value
           }
       }
     }
   }
 
-  /** The resolved options in their wire shape (what getOptions/onOptionsChanged report). */
-  fun toNitro(): Options {
-    return Options(
-      android =
-        AndroidOptions(
-          appKilledPlaybackBehavior = appKilledPlaybackBehavior,
-          skipSilence = skipSilence,
-          remoteButtonLayout =
-            remoteButtonLayout?.let { Variant_NullType_RemoteButtonLayout.create(it) },
-        ),
+  fun toNitro(): UpdateOptions {
+    // Create Android options
+    val androidOptions =
+      AndroidUpdateOptions(
+        appKilledPlaybackBehavior = appKilledPlaybackBehavior,
+        skipSilence = skipSilence,
+        shuffle = shuffle,
+        ratingType = ratingType,
+        notificationButtons =
+          notificationButtons?.let { Variant_NullType_NotificationButtonLayout.create(it) },
+      )
+
+    return UpdateOptions(
+      android = androidOptions,
       forwardJumpInterval = forwardJumpInterval,
       backwardJumpInterval = backwardJumpInterval,
       progressUpdateEventInterval =
         progressUpdateEventInterval?.let { Variant_NullType_Double.create(it) },
       capabilities = capabilities,
-      ios = null, // iOS-only options
+      iosPlaybackRates = null, // iOS-only option
     )
   }
 
   /** Merge incoming capabilities with existing - only explicitly set values override */
   private fun mergeCapabilities(
     existing: PlayerCapabilities,
-    incoming: PlayerCapabilities,
+    incoming: PlayerCapabilities
   ): PlayerCapabilities {
     return PlayerCapabilities(
       play = incoming.play ?: existing.play,
@@ -113,7 +119,7 @@ data class PlayerUpdateOptions(
       favorite = incoming.favorite ?: existing.favorite,
       shuffleMode = incoming.shuffleMode ?: existing.shuffleMode,
       repeatMode = incoming.repeatMode ?: existing.repeatMode,
-      playbackRate = incoming.playbackRate ?: existing.playbackRate,
+      playbackRate = incoming.playbackRate ?: existing.playbackRate
     )
   }
 }