react-native-audio-browser 0.2.0-next.14 → 0.2.0-next.16

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

@@ -460,8 +460,14 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
       browserManager.config = buildConfig()
 
       // Notify player that browser configuration is ready (routes/tabs available)
-      // This allows Android Auto to start browsing content
-      connectedService?.player?.notifyBrowserConfigurationReady()
+      // This allows Android Auto to start browsing content.
+      // This reaches MediaSession.getConnectedControllers, which asserts the
+      // main thread, and this setter runs on the JS thread. Hop without
+      // blocking -- runBlockingOnMain would deadlock here for the same reason
+      // described for the navigation below (JS callbacks can't run while the
+      // JS thread waits). Ordering with navigationJob is preserved: both are
+      // queued on mainScope.
+      launchInScope { connectedService?.player?.notifyBrowserConfigurationReady() }
 
       clearNavigationError()
 
@@ -777,8 +783,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     // Invalidate cached content so future navigations fetch fresh data
     browserManager.invalidateContentCache(path)
 
-    // Notify external media controllers (Android Auto)
-    connectedService?.player?.notifyContentChanged(path)
+    // Notify external media controllers (Android Auto). Reaches MediaSession,
+    // which asserts the main thread; this override runs on the JS thread.
+    launchInScope { connectedService?.player?.notifyContentChanged(path) }
 
     // If we're currently viewing this path, refresh the content
     if (browserManager.getPath() == path) {
@@ -792,8 +799,10 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     // Clear all cached content so every path re-fetches fresh data
     browserManager.clearContentCache()
 
-    // Notify external media controllers (Android Auto) to refresh subscribed paths
-    connectedService?.player?.invalidateAllContent()
+    // Notify external media controllers (Android Auto) to refresh subscribed paths.
+    // Reaches MediaSession, which asserts the main thread; this override runs on
+    // the JS thread.
+    launchInScope { connectedService?.player?.invalidateAllContent() }
 
     // Refresh whatever the browser is currently viewing
     mainScope.launch { browserManager.refresh() }
@@ -834,14 +843,16 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
     // Re-query every subscribed parent so a connected controller (Android
     // Auto) swaps its lists for the gate tile without reconnecting. Notify
     // only — the content cache stays warm for when the gate clears.
-    connectedService?.player?.invalidateAllContent()
+    // MediaSession asserts the main thread; this override runs on the JS thread.
+    launchInScope { connectedService?.player?.invalidateAllContent() }
   }
 
   override fun clearGate() {
     if (!gateState.active) return
     // Single atomic assignment — readers never see a half-cleared triple.
     gateState = GateState(active = false, chrome = null, hasResolver = false)
-    connectedService?.player?.invalidateAllContent()
+    // MediaSession asserts the main thread; this override runs on the JS thread.
+    launchInScope { connectedService?.player?.invalidateAllContent() }
   }
 
   /**
@@ -927,8 +938,17 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
 
   override fun updateOptions(options: NativeUpdateOptions) {
     updateOptions.updateFromBridge(options)
-    // Only update the options if the service is around
-    connectedService?.let { player.applyOptions(updateOptions) }
+    // Only update the options if the service is around.
+    // applyOptions touches the Media3 player, which asserts it is only ever
+    // driven from the main thread ("Player callback method is called from a
+    // wrong thread"). Nitro invokes this from the JS thread, so hop.
+    //
+    // The hop blocks rather than launching because `updateOptions` is a single
+    // mutable holder: updateFromBridge mutates it in place on the JS thread and
+    // applyOptions reads it on main. Blocking is what keeps the two ordered.
+    connectedService?.let { service ->
+      runBlockingOnMain { service.player.applyOptions(updateOptions) }
+    }
   }
 
   override fun getOptions(): Options {

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

@@ -359,6 +359,7 @@ class BrowserManager {
           disabled = null,
           favorited = null,
           live = null,
+          icyCharset = null,
         )
       )
     }
@@ -1005,6 +1006,7 @@ class BrowserManager {
           disabled = null,
           favorited = null,
           live = null,
+          icyCharset = null,
         )
 
       // Cache search results for getCachedSearchResults()
@@ -1044,6 +1046,7 @@ class BrowserManager {
           disabled = null,
           favorited = null,
           live = null,
+          icyCharset = null,
         )
 
       return emptySearchResult

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

@@ -65,6 +65,7 @@ data class JsonResolvedTrack(
   val style: JsonElement? = null,
   val disabled: Boolean? = null,
   val live: Boolean? = null,
+  val icyCharset: String? = null,
   val carPlaySiriListButton: String? = null,
 )
 
@@ -87,6 +88,7 @@ data class JsonTrack(
   val style: JsonElement? = null,
   val disabled: Boolean? = null,
   val live: Boolean? = null,
+  val icyCharset: String? = null,
 )
 
 /**
@@ -179,6 +181,7 @@ fun JsonResolvedTrack.toNitro(): ResolvedTrack {
     disabled = disabled,
     favorited = null,
     live = live,
+    icyCharset = icyCharset,
   )
 }
 
@@ -202,5 +205,6 @@ fun JsonTrack.toNitro(): Track {
     disabled = disabled,
     favorited = null,
     live = live,
+    icyCharset = icyCharset,
   )
 }

package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt

@@ -44,4 +44,5 @@ fun ResolvedTrack.toTrack(): Track =
     disabled = disabled,
     favorited = favorited,
     live = live,
+    icyCharset = icyCharset,
   )

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

@@ -0,0 +1,24 @@
+package com.audiobrowser.model
+
+import java.nio.charset.Charset
+
+/** Re-decodes an ICY `StreamTitle` with the charset the track declares. */
+internal object IcyTitle {
+  /**
+   * [title] re-decoded through ISO-8859-1 with [charset] when it is Latin-1 shaped: every char at
+   * or below U+00FF, at least one at or above U+0080. That shape is what media3's ISO-8859-1
+   * fallback yields for bytes that are not UTF-8, and also what a station that UTF-8-encoded its
+   * legacy bytes yields; ISO-8859-1 is lossless, so both re-decode. Returns [title] as is when it
+   * has another shape, is pure ASCII, or [charset] is not one the runtime can decode with.
+   */
+  fun redecode(title: String, charset: String): String {
+    var high = false
+    for (c in title) {
+      if (c.code > 0xFF) return title
+      if (c.code >= 0x80) high = true
+    }
+    if (!high) return title
+    val cs = runCatching { Charset.forName(charset) }.getOrNull() ?: return title
+    return String(title.toByteArray(Charsets.ISO_8859_1), cs)
+  }
+}

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

@@ -15,11 +15,12 @@ data class PlaybackMetadata(
   companion object {
     /**
      * Creates PlaybackMetadata from raw Metadata entries. Handles ICY streams specially, uses
-     * Media3's unified approach for everything else.
+     * Media3's unified approach for everything else. [icyCharset] is the track's declared charset
+     * for ICY titles media3 decoded as Latin-1; it never touches other metadata.
      */
-    fun from(metadata: Metadata): PlaybackMetadata? {
+    fun from(metadata: Metadata, icyCharset: String? = null): PlaybackMetadata? {
       // Try ICY first (streaming-specific)
-      fromIcy(metadata)?.let {
+      fromIcy(metadata, icyCharset)?.let {
         return it
       }
 
@@ -32,12 +33,15 @@ data class PlaybackMetadata(
     }
 
     /** Shoutcast / Icecast metadata (ICY protocol) https://cast.readme.io/docs/icy */
-    private fun fromIcy(metadata: Metadata): PlaybackMetadata? {
+    private fun fromIcy(metadata: Metadata, icyCharset: String?): PlaybackMetadata? {
       for (i in 0 until metadata.length()) {
         when (val entry = metadata[i]) {
           is IcyInfo -> {
-            if (entry.title != null) {
-              return PlaybackMetadata(title = entry.title)
+            val title = entry.title
+            if (title != null) {
+              return PlaybackMetadata(
+                title = icyCharset?.let { IcyTitle.redecode(title, it) } ?: title
+              )
             }
           }
         }

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

@@ -233,6 +233,7 @@ class PlaybackStateStore(private val player: Player) {
           put("disabled", track.disabled)
           put("favorited", track.favorited)
           put("live", track.live)
+          put("icyCharset", track.icyCharset)
         }
         .toString()
 
@@ -281,6 +282,7 @@ class PlaybackStateStore(private val player: Player) {
               if (obj.has("favorited") && !obj.isNull("favorited")) obj.getBoolean("favorited")
               else null,
             live = if (obj.has("live") && !obj.isNull("live")) obj.getBoolean("live") else null,
+            icyCharset = obj.optString("icyCharset").takeIf { it.isNotEmpty() },
             // Not persisted: on resumption the contextual path is re-browsed
             // (expandQueueFromContextualPath), which re-parses each track's request
             // from the API's current response and re-caches it.

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

@@ -59,7 +59,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
     }
 
     // Extract and emit timed metadata (ICY, ID3, etc.)
-    PlaybackMetadata.from(metadata)?.let {
+    PlaybackMetadata.from(metadata, player.currentTrack?.icyCharset)?.let {
       val timed = it.toNitro()
       player.callbacks?.onTimedMetadata(timed)
       player.nowPlaying.onTimedMetadataReceived(timed)

package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt

@@ -64,6 +64,7 @@ object TrackFactory {
       disabled = null,
       favorited = null,
       live = null,
+      icyCharset = null,
     )
 
   fun toMedia3(tracks: Array<Track>): List<MediaItem> {

package/android/src/test/java/com/audiobrowser/TestFixtures.kt

@@ -55,6 +55,7 @@ object TestFixtures {
       disabled = disabled,
       favorited = favorited,
       live = null,
+      icyCharset = null,
     )
 
   /** A page [Section] — plain list by default. */
@@ -136,6 +137,7 @@ object TestFixtures {
       disabled = null,
       favorited = null,
       live = null,
+      icyCharset = null,
     )
 
   /** A container [ResolvedTrack] — what a browse route hands back for a path. */
@@ -168,6 +170,7 @@ object TestFixtures {
       disabled = null,
       favorited = null,
       live = null,
+      icyCharset = null,
     )
 
   /**

package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt

@@ -0,0 +1,49 @@
+package com.audiobrowser.model
+
+import java.nio.charset.Charset
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class IcyTitleTest {
+  /** What media3's ISO-8859-1 fallback yields for [text] sent as [charset]. */
+  private fun latin1Shaped(text: String, charset: String) =
+    String(text.toByteArray(Charset.forName(charset)), Charsets.ISO_8859_1)
+
+  @Test
+  fun `re-decodes a legacy code page title`() {
+    val title = latin1Shaped("Артист - Песня", "windows-1251")
+    assertEquals("Артист - Песня", IcyTitle.redecode(title, "windows-1251"))
+  }
+
+  @Test
+  fun `re-decodes thai`() {
+    val title = latin1Shaped("ศิลปิน - เพลง", "windows-874")
+    assertEquals("ศิลปิน - เพลง", IcyTitle.redecode(title, "windows-874"))
+  }
+
+  @Test
+  fun `re-decodes a title the station utf-8 encoded from legacy bytes`() {
+    // media3 decodes the valid UTF-8 to the same Latin-1-shaped string the fallback would give.
+    val doubleEncoded = latin1Shaped("Artist - เพลง", "windows-874").toByteArray(Charsets.UTF_8)
+    assertEquals(
+      "Artist - เพลง",
+      IcyTitle.redecode(String(doubleEncoded, Charsets.UTF_8), "windows-874"),
+    )
+  }
+
+  @Test
+  fun `leaves a title already in another script`() {
+    assertEquals("Песня", IcyTitle.redecode("Песня", "windows-1251"))
+  }
+
+  @Test
+  fun `leaves ascii`() {
+    assertEquals("Plain Title", IcyTitle.redecode("Plain Title", "windows-1251"))
+  }
+
+  @Test
+  fun `ignores a charset the runtime cannot decode with`() {
+    val title = latin1Shaped("Песня", "windows-1251")
+    assertEquals(title, IcyTitle.redecode(title, "no-such-charset"))
+  }
+}

package/ios/Browser/BrowserManager.swift

@@ -738,6 +738,7 @@ final class BrowserManager {
       disabled: nil,
       favorited: nil,
       live: nil,
+      icyCharset: nil,
     )
   }
 

package/ios/Browser/JsonModels.swift

@@ -284,6 +284,7 @@ struct JsonResolvedTrack: Codable {
   let style: JsonStyle?
   let disabled: Bool?
   let live: Bool?
+  let icyCharset: String?
   let carPlaySiriListButton: String?
 
   init(
@@ -304,6 +305,7 @@ struct JsonResolvedTrack: Codable {
     style: JsonStyle? = nil,
     disabled: Bool? = nil,
     live: Bool? = nil,
+    icyCharset: String? = nil,
     carPlaySiriListButton: String? = nil,
   ) {
     self.path = path
@@ -322,6 +324,7 @@ struct JsonResolvedTrack: Codable {
     self.style = style
     self.disabled = disabled
     self.live = live
+    self.icyCharset = icyCharset
     self.carPlaySiriListButton = carPlaySiriListButton
     self.id = id
   }
@@ -345,6 +348,7 @@ struct JsonTrack: Codable {
   let style: JsonStyle?
   let disabled: Bool?
   let live: Bool?
+  let icyCharset: String?
 
   init(
     id: String? = nil,
@@ -363,6 +367,7 @@ struct JsonTrack: Codable {
     style: JsonStyle? = nil,
     disabled: Bool? = nil,
     live: Bool? = nil,
+    icyCharset: String? = nil,
   ) {
     self.path = path
     self.title = title
@@ -379,6 +384,7 @@ struct JsonTrack: Codable {
     self.style = style
     self.disabled = disabled
     self.live = live
+    self.icyCharset = icyCharset
     self.id = id
   }
 }
@@ -417,6 +423,7 @@ struct JsonTrack: Codable {
         style: JsonStyle(track.style),
         disabled: track.disabled,
         live: track.live,
+        icyCharset: track.icyCharset,
       )
     }
   }
@@ -447,6 +454,7 @@ struct JsonTrack: Codable {
         style: JsonStyle(track.style),
         disabled: track.disabled,
         live: track.live,
+        icyCharset: track.icyCharset,
       )
     }
   }
@@ -491,6 +499,7 @@ struct JsonTrack: Codable {
         disabled: disabled,
         favorited: nil,
         live: live,
+        icyCharset: icyCharset,
       )
     }
   }
@@ -516,6 +525,7 @@ struct JsonTrack: Codable {
         disabled: disabled,
         favorited: nil,
         live: live,
+        icyCharset: icyCharset,
       )
     }
   }
@@ -538,6 +548,7 @@ struct JsonTrack: Codable {
         style: style?.toTrackStyle(),
         disabled: disabled,
         live: live,
+        icyCharset: icyCharset,
       )
     }
   }

package/ios/CarPlay/CarPlayImageLoader.swift

@@ -72,8 +72,10 @@ final class CarPlayImageLoader {
       return
     }
 
-    // Build URL resolver closure that wraps BrowserManager
-    let urlResolver: ((Double, Double) async -> ArtworkResolvedImage?)? = browserManager.map { bm in
+    // The annotation goes on the closure's return type, not the binding:
+    // @Sendable isn't inferred through `map`, and omitting it fails with
+    // "type of expression is ambiguous" — which doesn't mention @Sendable.
+    let urlResolver = browserManager.map { bm -> @Sendable (Double, Double) async -> ArtworkResolvedImage? in
       { [weak bm] pixelWidth, pixelHeight in
         guard let bm else { return nil }
         let imageContext = ImageContext(width: pixelWidth, height: pixelHeight)

package/ios/CarPlay/CarPlayListItemFactory.swift

@@ -259,7 +259,7 @@ final class CarPlayListItemFactory {
     // API (the elements are captured per availability branch — their type
     // doesn't exist before iOS 26). nil = the legacy gridImages path.
     // @MainActor makes the closure Sendable for the artwork completion hop.
-    var applyImage: (@MainActor (Int, UIImage) -> Void)?
+    var applyImage: (@MainActor @Sendable (Int, UIImage) -> Void)?
     // Resolved once per track, shared by element construction and the
     // artwork loads below.
     let resolvedStyles = tracks.map { StyleResolver.trackStyle(track: $0.style, section: style) }
@@ -280,7 +280,7 @@ final class CarPlayListItemFactory {
       }
       // The image setter every element family shares (`image` is on the base
       // class); bounds-checked against the elements the row was built with.
-      func imageApplier(_ elements: [some CPListImageRowItemElement]) -> @MainActor (Int, UIImage) -> Void {
+      func imageApplier(_ elements: [some CPListImageRowItemElement]) -> @MainActor @Sendable (Int, UIImage) -> Void {
         { index, image in
           guard index < elements.count else { return }
           elements[index].image = image
@@ -386,7 +386,7 @@ final class CarPlayListItemFactory {
         for: track,
         style: resolved,
         size: Self.tileImageSize(gridTile: style.gridTile, cardImage: resolved.cardImage),
-      ) { [weak item] image in
+      ) { [weak item, applyImage] image in
         Task { @MainActor in
           guard let item, let image else { return }
           if let applyImage {
@@ -417,7 +417,7 @@ final class CarPlayListItemFactory {
       id: nil, path: path, src: nil, artwork: nil, artworkSource: nil,
       request: nil, title: title ?? "", subtitle: nil,
       artist: nil, albumPath: nil, album: nil, description: nil, genre: nil,
-      duration: nil, style: nil, disabled: nil, favorited: nil, live: nil,
+      duration: nil, style: nil, disabled: nil, favorited: nil, live: nil, icyCharset: nil,
     )
   }
 }

package/ios/Extension/ResolvedTrack+Copying.swift

@@ -33,6 +33,7 @@ extension ResolvedTrack {
     disabled: Bool?? = nil,
     favorited: Bool?? = nil,
     live: Bool?? = nil,
+    icyCharset: String?? = nil,
   ) -> ResolvedTrack {
     ResolvedTrack(
       path: path ?? self.path,
@@ -56,6 +57,7 @@ extension ResolvedTrack {
       disabled: disabled ?? self.disabled,
       favorited: favorited ?? self.favorited,
       live: live ?? self.live,
+      icyCharset: icyCharset ?? self.icyCharset,
     )
   }
 }

package/ios/Extension/String+IcyCharset.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+extension String {
+  /// Re-decodes an ICY `StreamTitle` that AVFoundation decoded as Latin-1 with the
+  /// charset the track declares. AVFoundation keeps no raw bytes, so the tell is the
+  /// shape: every scalar at or below U+00FF with at least one at or above U+0080. A
+  /// title already decoded to another script contains higher scalars and is returned
+  /// as is, as is pure ASCII, an unknown charset, or bytes the charset cannot decode.
+  func redecodingIcyTitle(charset: String) -> String {
+    var high = false
+    for scalar in unicodeScalars {
+      if scalar.value > 0xFF { return self }
+      if scalar.value >= 0x80 { high = true }
+    }
+    guard high, let data = data(using: .isoLatin1) else { return self }
+    let cfEncoding = CFStringConvertIANACharSetNameToEncoding(charset as CFString)
+    guard cfEncoding != kCFStringEncodingInvalidId else { return self }
+    let encoding = String.Encoding(rawValue: CFStringConvertEncodingToNSStringEncoding(cfEncoding))
+    return String(data: data, encoding: encoding) ?? self
+  }
+}

package/ios/Extension/TimedMetadata+AVFoundation.swift

@@ -6,11 +6,13 @@ import AVFoundation
 
 extension TimedMetadata {
   /// Creates TimedMetadata from AVMetadataItem array, detecting the metadata format.
-  static func from(items: [AVMetadataItem]) -> TimedMetadata? {
+  /// `icyCharset` is the track's declared charset for ICY titles AVFoundation
+  /// decoded as Latin-1; it never touches ID3 or common metadata.
+  static func from(items: [AVMetadataItem], icyCharset: String? = nil) -> TimedMetadata? {
     // Check for ICY metadata (Shoutcast/Icecast streams)
     let icyItems = items.filter { $0.keySpace == .icy }
     if !icyItems.isEmpty {
-      return fromIcy(items: icyItems)
+      return fromIcy(items: icyItems, icyCharset: icyCharset)
     }
 
     // Check for ID3 metadata (MP3)
@@ -24,7 +26,7 @@ extension TimedMetadata {
   }
 
   /// Creates TimedMetadata from ICY (Shoutcast/Icecast) metadata.
-  static func fromIcy(items: [AVMetadataItem]) -> TimedMetadata? {
+  static func fromIcy(items: [AVMetadataItem], icyCharset: String? = nil) -> TimedMetadata? {
     var title: String?
 
     for item in items {
@@ -35,7 +37,7 @@ extension TimedMetadata {
 
     guard let title else { return nil }
     return TimedMetadata(
-      title: title,
+      title: icyCharset.map { title.redecodingIcyTitle(charset: $0) } ?? title,
       artist: nil,
       album: nil,
       date: nil,

package/ios/Extension/Track+Copying.swift

@@ -28,6 +28,7 @@ extension Track {
     disabled: Bool?? = nil,
     favorited: Bool?? = nil,
     live: Bool?? = nil,
+    icyCharset: String?? = nil,
   ) -> Track {
     Track(
       id: id ?? self.id,
@@ -48,6 +49,7 @@ extension Track {
       disabled: disabled ?? self.disabled,
       favorited: favorited ?? self.favorited,
       live: live ?? self.live,
+      icyCharset: icyCharset ?? self.icyCharset,
     )
   }
 }

package/ios/HybridAudioBrowser.swift

@@ -1760,7 +1760,7 @@ extension HybridAudioBrowser: TrackPlayerCallbacks {
 
   public func playerDidReceiveTimedMetadata(_ groups: [AVTimedMetadataGroup]) {
     for group in groups {
-      if let metadata = TimedMetadata.from(items: group.items) {
+      if let metadata = TimedMetadata.from(items: group.items, icyCharset: player?.currentTrack?.icyCharset) {
         latestTimedMetadata = metadata
         onTimedMetadata(metadata)
         // Re-render the now-playing so the formatter can reflect the live song.

package/ios/Model/NitroTypeStubs.swift

@@ -42,6 +42,7 @@
     var style: TrackStyle?
     var disabled: Bool?
     var live: Bool?
+    var icyCharset: String?
   }
 
   struct TrackLoadEvent {
@@ -216,6 +217,7 @@
     var disabled: Bool?
     var favorited: Bool?
     var live: Bool?
+    var icyCharset: String?
   }
 
   enum PlaybackState: Equatable {

package/ios/Player/SeekCompletionHandler.swift

@@ -1,3 +1,5 @@
-@MainActor protocol SeekCompletionHandler: AnyObject {
+// Sendable so LoadSeekCoordinator can carry a delegate into AVPlayer's
+// @Sendable seek completion closure; @MainActor is what keeps that sound.
+@MainActor protocol SeekCompletionHandler: AnyObject, Sendable {
   func handleSeekCompleted(to seconds: Double, didFinish: Bool)
 }

package/ios/Tests/PlaybackStateStoreTests.swift

@@ -18,7 +18,7 @@ struct PlaybackStateStoreTests {
       artist: "City, Country", albumPath: nil, album: nil, description: nil,
       genre: nil, duration: nil, src: "/listen/abc/channel.mp3", request: nil,
       style: JsonStyle(display: "grid", artworkRendering: "stencil"),
-      disabled: false, live: true,
+      disabled: false, live: true, icyCharset: "windows-1251",
     )
   }
 

package/ios/Tests/ResolvedTrackCopyingTests.swift

@@ -25,6 +25,7 @@ private func makeResolvedTrack(
     disabled: nil,
     favorited: nil,
     live: nil,
+    icyCharset: nil,
   )
 }
 
@@ -49,6 +50,7 @@ private func makeFullResolvedTrack() -> ResolvedTrack {
     disabled: false,
     favorited: true,
     live: false,
+    icyCharset: nil,
   )
 }
 

package/ios/Tests/TimedMetadataAVFoundationTests.swift

@@ -20,6 +20,48 @@ struct TimedMetadataICYTests {
     #expect(result?.artist == nil)
   }
 
+  private func icyTitle(_ value: String) -> AVMetadataItem {
+    let item = AVMutableMetadataItem()
+    item.key = "StreamTitle" as NSString
+    item.keySpace = .icy
+    item.value = value as NSString
+    return item
+  }
+
+  // "Песня" as windows-1251 bytes, decoded as Latin-1 the way AVFoundation does when it guesses wrong.
+  private let latin1Shaped = "\u{CF}\u{E5}\u{F1}\u{ED}\u{FF}"
+
+  @Test func icyCharset_redecodesLatin1ShapedTitle() {
+    let result = TimedMetadata.from(items: [icyTitle(latin1Shaped)], icyCharset: "windows-1251")
+    #expect(result?.title == "Песня")
+  }
+
+  @Test func icyCharset_leavesAlreadyDecodedTitle() {
+    let result = TimedMetadata.from(items: [icyTitle("Песня")], icyCharset: "windows-1251")
+    #expect(result?.title == "Песня")
+  }
+
+  @Test func icyCharset_leavesAscii() {
+    let result = TimedMetadata.from(items: [icyTitle("Plain Title")], icyCharset: "windows-1251")
+    #expect(result?.title == "Plain Title")
+  }
+
+  @Test func icyCharset_ignoresUnknownCharset() {
+    let result = TimedMetadata.from(items: [icyTitle(latin1Shaped)], icyCharset: "no-such-charset")
+    #expect(result?.title == latin1Shaped)
+  }
+
+  @Test func icyCharset_absent_keepsTitle() {
+    let result = TimedMetadata.from(items: [icyTitle(latin1Shaped)])
+    #expect(result?.title == latin1Shaped)
+  }
+
+  @Test func icyCharset_neverTouchesId3() {
+    let items = [makeMetadataItem(identifier: .id3MetadataTitleDescription, value: latin1Shaped)]
+    let result = TimedMetadata.from(items: items, icyCharset: "windows-1251")
+    #expect(result?.title == latin1Shaped)
+  }
+
   @Test func icyWithoutStreamTitle_returnsNil() {
     let item = AVMutableMetadataItem()
     item.key = "StreamUrl" as NSString

package/lib/typescript/src/types/browser-nodes.d.ts

@@ -505,6 +505,20 @@ export interface Track {
      * calls. Declare it on every live track.
      */
     live?: boolean;
+    /**
+     * Byte encoding of this track's ICY `StreamTitle` when it is not UTF-8, as
+     * an IANA label (`'windows-1251'`, `'windows-874'`, …). Some Shoutcast /
+     * Icecast stations send titles in a legacy code page; ICY declares no
+     * encoding, so the player's UTF-8 decode fails and falls back to Latin-1,
+     * showing mojibake. With this set, a title that came out Latin-1 shaped
+     * (every char at or below U+00FF, some at or above U+0080) is re-decoded
+     * through ISO-8859-1 with the given charset; this also repairs stations
+     * that UTF-8 encoded their legacy bytes. A title already in another script
+     * or pure ASCII is left alone. Applies to ICY only: ID3 and HLS timed
+     * metadata declare their own encoding and are never touched. A label the
+     * platform cannot decode with is ignored.
+     */
+    icyCharset?: string;
 }
 /**
  * A Track that has been resolved with its children through browsing.

package/lib/typescript/src/types/browser-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-nodes.d.ts","sourceRoot":"","sources":["../../../../src/types/browser-nodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser-nodes.d.ts","sourceRoot":"","sources":["../../../../src/types/browser-nodes.ts"],"names":[],"mappings":"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"}

package/nitrogen/generated/android/c++/JResolvedTrack.hpp

@@ -106,6 +106,8 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<jni::JBoolean> favorited = this->getFieldValue(fieldFavorited);
       static const auto fieldLive = clazz->getField<jni::JBoolean>("live");
       jni::local_ref<jni::JBoolean> live = this->getFieldValue(fieldLive);
+      static const auto fieldIcyCharset = clazz->getField<jni::JString>("icyCharset");
+      jni::local_ref<jni::JString> icyCharset = this->getFieldValue(fieldIcyCharset);
       return ResolvedTrack(
         path->toStdString(),
         style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
@@ -145,7 +147,8 @@ namespace margelo::nitro::audiobrowser {
         duration != nullptr ? std::make_optional(duration->value()) : std::nullopt,
         disabled != nullptr ? std::make_optional(static_cast<bool>(disabled->value())) : std::nullopt,
         favorited != nullptr ? std::make_optional(static_cast<bool>(favorited->value())) : std::nullopt,
-        live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt
+        live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt,
+        icyCharset != nullptr ? std::make_optional(icyCharset->toStdString()) : std::nullopt
       );
     }
 
@@ -155,7 +158,7 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JResolvedTrack::javaobject> fromCpp(const ResolvedTrack& value) {
-      using JSignature = JResolvedTrack(jni::alias_ref<jni::JString>, jni::alias_ref<JSectionStyle>, jni::alias_ref<jni::JArrayClass<JSection>>, jni::alias_ref<jni::JArrayClass<JTrack>>, jni::alias_ref<JCarPlaySiriListButtonPosition>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JVariant_String_ArtworkVariants>, jni::alias_ref<JImageSource>, jni::alias_ref<JTrackRequest>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
+      using JSignature = JResolvedTrack(jni::alias_ref<jni::JString>, jni::alias_ref<JSectionStyle>, jni::alias_ref<jni::JArrayClass<JSection>>, jni::alias_ref<jni::JArrayClass<JTrack>>, jni::alias_ref<JCarPlaySiriListButtonPosition>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JVariant_String_ArtworkVariants>, jni::alias_ref<JImageSource>, jni::alias_ref<JTrackRequest>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -198,7 +201,8 @@ namespace margelo::nitro::audiobrowser {
         value.duration.has_value() ? jni::JDouble::valueOf(value.duration.value()) : nullptr,
         value.disabled.has_value() ? jni::JBoolean::valueOf(value.disabled.value()) : nullptr,
         value.favorited.has_value() ? jni::JBoolean::valueOf(value.favorited.value()) : nullptr,
-        value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr
+        value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr,
+        value.icyCharset.has_value() ? jni::make_jstring(value.icyCharset.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/c++/JTrack.hpp

@@ -89,6 +89,8 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<jni::JBoolean> favorited = this->getFieldValue(fieldFavorited);
       static const auto fieldLive = clazz->getField<jni::JBoolean>("live");
       jni::local_ref<jni::JBoolean> live = this->getFieldValue(fieldLive);
+      static const auto fieldIcyCharset = clazz->getField<jni::JString>("icyCharset");
+      jni::local_ref<jni::JString> icyCharset = this->getFieldValue(fieldIcyCharset);
       return Track(
         id != nullptr ? std::make_optional(id->toStdString()) : std::nullopt,
         path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
@@ -107,7 +109,8 @@ namespace margelo::nitro::audiobrowser {
         style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
         disabled != nullptr ? std::make_optional(static_cast<bool>(disabled->value())) : std::nullopt,
         favorited != nullptr ? std::make_optional(static_cast<bool>(favorited->value())) : std::nullopt,
-        live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt
+        live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt,
+        icyCharset != nullptr ? std::make_optional(icyCharset->toStdString()) : std::nullopt
       );
     }
 
@@ -117,7 +120,7 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JTrack::javaobject> fromCpp(const Track& value) {
-      using JSignature = JTrack(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JVariant_String_ArtworkVariants>, jni::alias_ref<JImageSource>, jni::alias_ref<JTrackRequest>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JTrackStyle>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
+      using JSignature = JTrack(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JVariant_String_ArtworkVariants>, jni::alias_ref<JImageSource>, jni::alias_ref<JTrackRequest>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JTrackStyle>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -139,7 +142,8 @@ namespace margelo::nitro::audiobrowser {
         value.style.has_value() ? JTrackStyle::fromCpp(value.style.value()) : nullptr,
         value.disabled.has_value() ? jni::JBoolean::valueOf(value.disabled.value()) : nullptr,
         value.favorited.has_value() ? jni::JBoolean::valueOf(value.favorited.value()) : nullptr,
-        value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr
+        value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr,
+        value.icyCharset.has_value() ? jni::make_jstring(value.icyCharset.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt

@@ -79,7 +79,10 @@ data class ResolvedTrack(
   val favorited: Boolean?,
   @DoNotStrip
   @Keep
-  val live: Boolean?
+  val live: Boolean?,
+  @DoNotStrip
+  @Keep
+  val icyCharset: String?
 ) {
   /* primary constructor */
 
@@ -91,8 +94,8 @@ data class ResolvedTrack(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(path: String, style: SectionStyle?, sections: Array<Section>?, children: Array<Track>?, carPlaySiriListButton: CarPlaySiriListButtonPosition?, id: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, disabled: Boolean?, favorited: Boolean?, live: Boolean?): ResolvedTrack {
-      return ResolvedTrack(path, style, sections, children, carPlaySiriListButton, id, src, artwork, artworkSource, request, title, subtitle, artist, albumPath, album, description, genre, duration, disabled, favorited, live)
+    private fun fromCpp(path: String, style: SectionStyle?, sections: Array<Section>?, children: Array<Track>?, carPlaySiriListButton: CarPlaySiriListButtonPosition?, id: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, disabled: Boolean?, favorited: Boolean?, live: Boolean?, icyCharset: String?): ResolvedTrack {
+      return ResolvedTrack(path, style, sections, children, carPlaySiriListButton, id, src, artwork, artworkSource, request, title, subtitle, artist, albumPath, album, description, genre, duration, disabled, favorited, live, icyCharset)
     }
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt

@@ -70,7 +70,10 @@ data class Track(
   val favorited: Boolean?,
   @DoNotStrip
   @Keep
-  val live: Boolean?
+  val live: Boolean?,
+  @DoNotStrip
+  @Keep
+  val icyCharset: String?
 ) {
   /* primary constructor */
 
@@ -82,8 +85,8 @@ data class Track(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(id: String?, path: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, disabled: Boolean?, favorited: Boolean?, live: Boolean?): Track {
-      return Track(id, path, src, artwork, artworkSource, request, title, subtitle, artist, albumPath, album, description, genre, duration, style, disabled, favorited, live)
+    private fun fromCpp(id: String?, path: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, disabled: Boolean?, favorited: Boolean?, live: Boolean?, icyCharset: String?): Track {
+      return Track(id, path, src, artwork, artworkSource, request, title, subtitle, artist, albumPath, album, description, genre, duration, style, disabled, favorited, live, icyCharset)
     }
   }
 }

package/nitrogen/generated/ios/swift/ResolvedTrack.swift

@@ -18,7 +18,7 @@ public extension ResolvedTrack {
   /**
    * Create a new instance of `ResolvedTrack`.
    */
-  init(path: String, style: SectionStyle?, sections: [Section]?, children: [Track]?, carPlaySiriListButton: CarPlaySiriListButtonPosition?, id: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, disabled: Bool?, favorited: Bool?, live: Bool?) {
+  init(path: String, style: SectionStyle?, sections: [Section]?, children: [Track]?, carPlaySiriListButton: CarPlaySiriListButtonPosition?, id: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, disabled: Bool?, favorited: Bool?, live: Bool?, icyCharset: String?) {
     self.init(std.string(path), { () -> bridge.std__optional_SectionStyle_ in
       if let __unwrappedValue = style {
         return bridge.create_std__optional_SectionStyle_(__unwrappedValue)
@@ -152,6 +152,12 @@ public extension ResolvedTrack {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_std__string_ in
+      if let __unwrappedValue = icyCharset {
+        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+      } else {
+        return .init()
+      }
     }())
   }
 
@@ -376,4 +382,16 @@ public extension ResolvedTrack {
       }
     }()
   }
+  
+  @inline(__always)
+  var icyCharset: String? {
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__icyCharset) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__icyCharset)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
+  }
 }

package/nitrogen/generated/ios/swift/Track.swift

@@ -18,7 +18,7 @@ public extension Track {
   /**
    * Create a new instance of `Track`.
    */
-  init(id: String?, path: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, disabled: Bool?, favorited: Bool?, live: Bool?) {
+  init(id: String?, path: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, disabled: Bool?, favorited: Bool?, live: Bool?, icyCharset: String?) {
     self.init({ () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = id {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -128,6 +128,12 @@ public extension Track {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_std__string_ in
+      if let __unwrappedValue = icyCharset {
+        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+      } else {
+        return .init()
+      }
     }())
   }
 
@@ -330,4 +336,16 @@ public extension Track {
       }
     }()
   }
+  
+  @inline(__always)
+  var icyCharset: String? {
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__icyCharset) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__icyCharset)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
+  }
 }

package/nitrogen/generated/shared/c++/ResolvedTrack.hpp

@@ -83,10 +83,11 @@ namespace margelo::nitro::audiobrowser {
     std::optional<bool> disabled     SWIFT_PRIVATE;
     std::optional<bool> favorited     SWIFT_PRIVATE;
     std::optional<bool> live     SWIFT_PRIVATE;
+    std::optional<std::string> icyCharset     SWIFT_PRIVATE;
 
   public:
     ResolvedTrack() = default;
-    explicit ResolvedTrack(std::string path, std::optional<SectionStyle> style, std::optional<std::vector<Section>> sections, std::optional<std::vector<Track>> children, std::optional<CarPlaySiriListButtonPosition> carPlaySiriListButton, std::optional<std::string> id, std::optional<std::string> src, std::optional<std::variant<std::string, ArtworkVariants>> artwork, std::optional<ImageSource> artworkSource, std::optional<TrackRequest> request, std::string title, std::optional<std::string> subtitle, std::optional<std::string> artist, std::optional<std::string> albumPath, std::optional<std::string> album, std::optional<std::string> description, std::optional<std::string> genre, std::optional<double> duration, std::optional<bool> disabled, std::optional<bool> favorited, std::optional<bool> live): path(path), style(style), sections(sections), children(children), carPlaySiriListButton(carPlaySiriListButton), id(id), src(src), artwork(artwork), artworkSource(artworkSource), request(request), title(title), subtitle(subtitle), artist(artist), albumPath(albumPath), album(album), description(description), genre(genre), duration(duration), disabled(disabled), favorited(favorited), live(live) {}
+    explicit ResolvedTrack(std::string path, std::optional<SectionStyle> style, std::optional<std::vector<Section>> sections, std::optional<std::vector<Track>> children, std::optional<CarPlaySiriListButtonPosition> carPlaySiriListButton, std::optional<std::string> id, std::optional<std::string> src, std::optional<std::variant<std::string, ArtworkVariants>> artwork, std::optional<ImageSource> artworkSource, std::optional<TrackRequest> request, std::string title, std::optional<std::string> subtitle, std::optional<std::string> artist, std::optional<std::string> albumPath, std::optional<std::string> album, std::optional<std::string> description, std::optional<std::string> genre, std::optional<double> duration, std::optional<bool> disabled, std::optional<bool> favorited, std::optional<bool> live, std::optional<std::string> icyCharset): path(path), style(style), sections(sections), children(children), carPlaySiriListButton(carPlaySiriListButton), id(id), src(src), artwork(artwork), artworkSource(artworkSource), request(request), title(title), subtitle(subtitle), artist(artist), albumPath(albumPath), album(album), description(description), genre(genre), duration(duration), disabled(disabled), favorited(favorited), live(live), icyCharset(icyCharset) {}
 
   public:
     friend bool operator==(const ResolvedTrack& lhs, const ResolvedTrack& rhs) = default;
@@ -122,7 +123,8 @@ namespace margelo::nitro {
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "duration"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "disabled"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "favorited"))),
-        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "live")))
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "live"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "icyCharset")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::ResolvedTrack& arg) {
@@ -148,6 +150,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "disabled"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.disabled));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "favorited"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.favorited));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "live"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.live));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "icyCharset"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.icyCharset));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -179,6 +182,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "disabled")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "favorited")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "live")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "icyCharset")))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/Track.hpp

@@ -70,10 +70,11 @@ namespace margelo::nitro::audiobrowser {
     std::optional<bool> disabled     SWIFT_PRIVATE;
     std::optional<bool> favorited     SWIFT_PRIVATE;
     std::optional<bool> live     SWIFT_PRIVATE;
+    std::optional<std::string> icyCharset     SWIFT_PRIVATE;
 
   public:
     Track() = default;
-    explicit Track(std::optional<std::string> id, std::optional<std::string> path, std::optional<std::string> src, std::optional<std::variant<std::string, ArtworkVariants>> artwork, std::optional<ImageSource> artworkSource, std::optional<TrackRequest> request, std::string title, std::optional<std::string> subtitle, std::optional<std::string> artist, std::optional<std::string> albumPath, std::optional<std::string> album, std::optional<std::string> description, std::optional<std::string> genre, std::optional<double> duration, std::optional<TrackStyle> style, std::optional<bool> disabled, std::optional<bool> favorited, std::optional<bool> live): id(id), path(path), src(src), artwork(artwork), artworkSource(artworkSource), request(request), title(title), subtitle(subtitle), artist(artist), albumPath(albumPath), album(album), description(description), genre(genre), duration(duration), style(style), disabled(disabled), favorited(favorited), live(live) {}
+    explicit Track(std::optional<std::string> id, std::optional<std::string> path, std::optional<std::string> src, std::optional<std::variant<std::string, ArtworkVariants>> artwork, std::optional<ImageSource> artworkSource, std::optional<TrackRequest> request, std::string title, std::optional<std::string> subtitle, std::optional<std::string> artist, std::optional<std::string> albumPath, std::optional<std::string> album, std::optional<std::string> description, std::optional<std::string> genre, std::optional<double> duration, std::optional<TrackStyle> style, std::optional<bool> disabled, std::optional<bool> favorited, std::optional<bool> live, std::optional<std::string> icyCharset): id(id), path(path), src(src), artwork(artwork), artworkSource(artworkSource), request(request), title(title), subtitle(subtitle), artist(artist), albumPath(albumPath), album(album), description(description), genre(genre), duration(duration), style(style), disabled(disabled), favorited(favorited), live(live), icyCharset(icyCharset) {}
 
   public:
     friend bool operator==(const Track& lhs, const Track& rhs) = default;
@@ -106,7 +107,8 @@ namespace margelo::nitro {
         JSIConverter<std::optional<margelo::nitro::audiobrowser::TrackStyle>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "style"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "disabled"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "favorited"))),
-        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "live")))
+        JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "live"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "icyCharset")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::audiobrowser::Track& arg) {
@@ -129,6 +131,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "disabled"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.disabled));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "favorited"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.favorited));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "live"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.live));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "icyCharset"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.icyCharset));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -157,6 +160,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "disabled")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "favorited")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "live")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "icyCharset")))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-browser",
-  "version": "0.2.0-next.14",
+  "version": "0.2.0-next.16",
   "description": "react-native-audio-browser is a react native package built with Nitro",
   "keywords": [
     "react-native",
@@ -60,11 +60,11 @@
     "example": "yarn workspace example-native",
     "ci:android": "yarn android:format:check && yarn android:types && yarn android:test",
     "ci:format": "oxfmt --check --ignore-path .gitignore --ignore-path .oxfmtignore .",
-    "ci:format:ios": "swiftformat --lint ios",
+    "ci:format:ios": "scripts/swiftformat.sh --lint ios",
     "ci:ios": "yarn ci:format:ios && yarn ios:test",
     "ci:lint": "oxlint --type-aware src",
     "format": "oxfmt --write --ignore-path .gitignore --ignore-path .oxfmtignore .",
-    "ios:format": "swiftformat ios",
+    "ios:format": "scripts/swiftformat.sh ios",
     "ios:ide": "yarn workspace example-native ios:ide",
     "ios:rebuild": "yarn workspace example-native ios:rebuild",
     "ios:test": "swift test --disable-sandbox",
@@ -80,21 +80,21 @@
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22",
-    "@types/react": "19.1.1",
-    "@types/react-dom": "19.1.7",
+    "@types/react": "19.2.3",
+    "@types/react-dom": "^19.2.0",
     "conventional-changelog-conventionalcommits": "^9.3.0",
     "del-cli": "^5.1.0",
     "happy-dom": "^20.11.2",
-    "nitrogen": "0.35.0",
+    "nitrogen": "0.35.10",
     "oxfmt": "^0.27.0",
     "oxlint": "^1.42.0",
     "oxlint-tsgolint": "^0.11.2",
-    "react": "19.1.1",
-    "react-dom": "19.1.1",
-    "react-native": "0.83.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "react-native": "0.86.2",
     "react-native-builder-bob": "^0.37.0",
     "react-native-monorepo-config": "^0.3.1",
-    "react-native-nitro-modules": "0.35.0",
+    "react-native-nitro-modules": "0.35.10",
     "semantic-release": "^25.0.3",
     "shaka-player": "^4.15.4",
     "typescript": "^7.0.2",

package/src/types/browser-nodes.ts

@@ -547,6 +547,21 @@ export interface Track {
    * calls. Declare it on every live track.
    */
   live?: boolean
+
+  /**
+   * Byte encoding of this track's ICY `StreamTitle` when it is not UTF-8, as
+   * an IANA label (`'windows-1251'`, `'windows-874'`, …). Some Shoutcast /
+   * Icecast stations send titles in a legacy code page; ICY declares no
+   * encoding, so the player's UTF-8 decode fails and falls back to Latin-1,
+   * showing mojibake. With this set, a title that came out Latin-1 shaped
+   * (every char at or below U+00FF, some at or above U+0080) is re-decoded
+   * through ISO-8859-1 with the given charset; this also repairs stations
+   * that UTF-8 encoded their legacy bytes. A title already in another script
+   * or pure ASCII is left alone. Applies to ICY only: ID3 and HLS timed
+   * metadata declare their own encoding and are never touched. A label the
+   * platform cannot decode with is ignored.
+   */
+  icyCharset?: string
 }
 
 /**

package/website/guide/track.md

@@ -149,6 +149,7 @@ Optional fields that change how a Track renders on CarPlay / Android Auto. Each
 | `favorited`                                | filled/empty heart (needs the `favorite` capability)                   | Android Auto, notification |
 | `live`                                     | a "live" indicator                                                     | iOS now-playing            |
 | `albumPath`                                | make the now-playing album line tappable                               | CarPlay                    |
+| `icyCharset`                               | decode ICY titles a station sends in a legacy code page                | iOS, Android               |
 
 A couple of constraints worth knowing: