react-native-nitro-player 1.6.0-alpha.0 → 1.6.0-alpha.1

package/android/src/main/java/com/margelo/nitro/nitroplayer/core/TrackPlayerListener.kt

@@ -7,6 +7,7 @@ import androidx.media3.common.MediaMetadata
 import androidx.media3.common.Metadata
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.extractor.metadata.icy.IcyInfo
 import com.margelo.nitro.nitroplayer.Reason
 import com.margelo.nitro.nitroplayer.RepeatMode
 import com.margelo.nitro.nitroplayer.TimedMetadata
@@ -90,16 +91,27 @@ internal class TrackPlayerEventListener(
     @UnstableApi
     override fun onMetadata(metadata: Metadata) {
         val builder = MediaMetadata.Builder()
+        var url: String? = null
         for (i in 0 until metadata.length()) {
-            metadata.get(i).populateMediaMetadata(builder)
+            val entry = metadata.get(i)
+            entry.populateMediaMetadata(builder)
+            // populateMediaMetadata drops IcyInfo.url — radio providers put the
+            // current track's artwork URL there, so read it off the entry directly.
+            if (entry is IcyInfo && !entry.url.isNullOrEmpty()) url = entry.url
         }
         val merged = builder.build()
-        val title = merged.title?.toString()
-        val artist = merged.artist?.toString()
+        var artist = merged.artist?.toString()
+        var title = merged.title?.toString()
+        // ICY streams pack both fields into one "Artist - Title" string
+        val separator = if (artist == null) title?.indexOf(" - ") ?: -1 else -1
+        if (separator > 0 && title != null && separator + 3 < title.length) {
+            artist = title.substring(0, separator)
+            title = title.substring(separator + 3)
+        }
         val album = merged.albumTitle?.toString()
         val artworkUrl = merged.artworkUri?.toString()
-        if (title == null && artist == null && album == null && artworkUrl == null) return
-        core.notifyTimedMetadata(TimedMetadata(title, artist, album, artworkUrl))
+        if (title == null && artist == null && album == null && url == null && artworkUrl == null) return
+        core.notifyTimedMetadata(TimedMetadata(title, artist, album, url, artworkUrl))
     }
 
     override fun onTimelineChanged(

package/ios/core/TrackPlayerListener.swift

@@ -510,6 +510,8 @@ extension TrackPlayerCore {
     var title: String?
     var artist: String?
     var album: String?
+    var url: String?
+    var artworkUrl: String?
 
     for group in groups {
       for item in group.items {
@@ -518,17 +520,40 @@ extension TrackPlayerCore {
         case .some(.commonKeyTitle): title = value
         case .some(.commonKeyArtist): artist = value
         case .some(.commonKeyAlbumName): album = value
+        case .some(.commonKeyArtwork): artworkUrl = value
         default:
-          // ICY/Shoutcast streams carry no common keys — match on the identifier
-          if item.identifier == .icyMetadataStreamTitle { title = value }
+          // ICY/Shoutcast streams carry no common keys — match on the identifier.
+          // StreamUrl is where radio providers put the current track's artwork.
+          switch item.identifier {
+          case .some(.icyMetadataStreamTitle): title = value
+          case .some(.icyMetadataStreamURL): url = value
+          case .some(.id3MetadataOfficialAudioSourceWebpage),
+               .some(.id3MetadataOfficialAudioFileWebpage):
+            if url == nil { url = value }
+          default: break
+          }
         }
       }
     }
 
-    guard title != nil || artist != nil || album != nil else { return }
+    (artist, title) = splitStreamTitle(artist: artist, title: title)
+
+    guard title != nil || artist != nil || album != nil || url != nil || artworkUrl != nil else { return }
     NitroPlayerLogger.log("TrackPlayerCore", "🏷️ Timed metadata - \(title ?? "-") / \(artist ?? "-")")
-    // artworkUrl is Android-only: iOS delivers embedded art as raw data, not a URL
-    notifyTimedMetadata(TimedMetadata(title: title, artist: artist, album: album, artworkUrl: nil))
+    notifyTimedMetadata(
+      TimedMetadata(title: title, artist: artist, album: album, url: url, artworkUrl: artworkUrl))
+  }
+
+  /// ICY streams pack both fields into one `"Artist - Title"` string. Split it when
+  /// the stream gave no separate artist, leaving an explicit artist untouched.
+  func splitStreamTitle(artist: String?, title: String?) -> (String?, String?) {
+    guard artist == nil, let title, let separator = title.range(of: " - ") else {
+      return (artist, title)
+    }
+    let left = String(title[title.startIndex..<separator.lowerBound])
+    let right = String(title[separator.upperBound...])
+    guard !left.isEmpty, !right.isEmpty else { return (artist, title) }
+    return (left, right)
   }
 
   func emitStateChange(reason: Reason? = nil) {

package/lib/types/PlayerQueue.d.ts

@@ -32,8 +32,16 @@ export interface PlayerState {
 /** In-stream metadata emitted while a stream plays (ICY/Shoutcast StreamTitle, ID3 frames) */
 export interface TimedMetadata {
     title?: string;
+    /** Split out of `title` when the stream sends only `"Artist - Title"` */
     artist?: string;
     album?: string;
+    /**
+     * ICY `StreamUrl` / ID3 webpage frame. Radio providers commonly put the
+     * current track's artwork URL here (Live365, StreamGuys), but some send a
+     * station or artist page instead — check the value before treating it as art.
+     */
+    url?: string;
+    /** Artwork URL the stream tagged as artwork, when it sends one explicitly */
     artworkUrl?: string;
 }
 export interface PlayerConfig {

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

@@ -38,12 +38,15 @@ namespace margelo::nitro::nitroplayer {
       jni::local_ref<jni::JString> artist = this->getFieldValue(fieldArtist);
       static const auto fieldAlbum = clazz->getField<jni::JString>("album");
       jni::local_ref<jni::JString> album = this->getFieldValue(fieldAlbum);
+      static const auto fieldUrl = clazz->getField<jni::JString>("url");
+      jni::local_ref<jni::JString> url = this->getFieldValue(fieldUrl);
       static const auto fieldArtworkUrl = clazz->getField<jni::JString>("artworkUrl");
       jni::local_ref<jni::JString> artworkUrl = this->getFieldValue(fieldArtworkUrl);
       return TimedMetadata(
         title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
         artist != nullptr ? std::make_optional(artist->toStdString()) : std::nullopt,
         album != nullptr ? std::make_optional(album->toStdString()) : std::nullopt,
+        url != nullptr ? std::make_optional(url->toStdString()) : std::nullopt,
         artworkUrl != nullptr ? std::make_optional(artworkUrl->toStdString()) : std::nullopt
       );
     }
@@ -54,7 +57,7 @@ namespace margelo::nitro::nitroplayer {
      */
     [[maybe_unused]]
     static jni::local_ref<JTimedMetadata::javaobject> fromCpp(const TimedMetadata& value) {
-      using JSignature = JTimedMetadata(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      using JSignature = JTimedMetadata(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>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -62,6 +65,7 @@ namespace margelo::nitro::nitroplayer {
         value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
         value.artist.has_value() ? jni::make_jstring(value.artist.value()) : nullptr,
         value.album.has_value() ? jni::make_jstring(value.album.value()) : nullptr,
+        value.url.has_value() ? jni::make_jstring(value.url.value()) : nullptr,
         value.artworkUrl.has_value() ? jni::make_jstring(value.artworkUrl.value()) : nullptr
       );
     }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/nitroplayer/TimedMetadata.kt

@@ -28,6 +28,9 @@ data class TimedMetadata(
   val album: String?,
   @DoNotStrip
   @Keep
+  val url: String?,
+  @DoNotStrip
+  @Keep
   val artworkUrl: String?
 ) {
   /* primary constructor */
@@ -40,8 +43,8 @@ data class TimedMetadata(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(title: String?, artist: String?, album: String?, artworkUrl: String?): TimedMetadata {
-      return TimedMetadata(title, artist, album, artworkUrl)
+    private fun fromCpp(title: String?, artist: String?, album: String?, url: String?, artworkUrl: String?): TimedMetadata {
+      return TimedMetadata(title, artist, album, url, artworkUrl)
     }
   }
 }

package/nitrogen/generated/ios/swift/TimedMetadata.swift

@@ -18,7 +18,7 @@ public extension TimedMetadata {
   /**
    * Create a new instance of `TimedMetadata`.
    */
-  init(title: String?, artist: String?, album: String?, artworkUrl: String?) {
+  init(title: String?, artist: String?, album: String?, url: String?, artworkUrl: String?) {
     self.init({ () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = title {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -37,6 +37,12 @@ public extension TimedMetadata {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_std__string_ in
+      if let __unwrappedValue = url {
+        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+      } else {
+        return .init()
+      }
     }(), { () -> bridge.std__optional_std__string_ in
       if let __unwrappedValue = artworkUrl {
         return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
@@ -82,6 +88,18 @@ public extension TimedMetadata {
     }()
   }
   
+  @inline(__always)
+  var url: String? {
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__url) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__url)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
+  }
+  
   @inline(__always)
   var artworkUrl: String? {
     return { () -> String? in

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

@@ -43,11 +43,12 @@ namespace margelo::nitro::nitroplayer {
     std::optional<std::string> title     SWIFT_PRIVATE;
     std::optional<std::string> artist     SWIFT_PRIVATE;
     std::optional<std::string> album     SWIFT_PRIVATE;
+    std::optional<std::string> url     SWIFT_PRIVATE;
     std::optional<std::string> artworkUrl     SWIFT_PRIVATE;
 
   public:
     TimedMetadata() = default;
-    explicit TimedMetadata(std::optional<std::string> title, std::optional<std::string> artist, std::optional<std::string> album, std::optional<std::string> artworkUrl): title(title), artist(artist), album(album), artworkUrl(artworkUrl) {}
+    explicit TimedMetadata(std::optional<std::string> title, std::optional<std::string> artist, std::optional<std::string> album, std::optional<std::string> url, std::optional<std::string> artworkUrl): title(title), artist(artist), album(album), url(url), artworkUrl(artworkUrl) {}
 
   public:
     friend bool operator==(const TimedMetadata& lhs, const TimedMetadata& rhs) = default;
@@ -66,6 +67,7 @@ namespace margelo::nitro {
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "title"))),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "artist"))),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "album"))),
+        JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "url"))),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "artworkUrl")))
       );
     }
@@ -74,6 +76,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "title"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.title));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "artist"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.artist));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "album"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.album));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "url"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.url));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "artworkUrl"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.artworkUrl));
       return obj;
     }
@@ -88,6 +91,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "title")))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "artist")))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "album")))) return false;
+      if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "url")))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "artworkUrl")))) return false;
       return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-player",
-  "version": "1.6.0-alpha.0",
+  "version": "1.6.0-alpha.1",
   "description": "A powerful audio player library for React Native with playlist management, playback controls, and support for Android Auto and CarPlay",
   "main": "lib/index",
   "module": "lib/index",

package/src/types/PlayerQueue.ts

@@ -43,8 +43,16 @@ export interface PlayerState {
 /** In-stream metadata emitted while a stream plays (ICY/Shoutcast StreamTitle, ID3 frames) */
 export interface TimedMetadata {
   title?: string
+  /** Split out of `title` when the stream sends only `"Artist - Title"` */
   artist?: string
   album?: string
+  /**
+   * ICY `StreamUrl` / ID3 webpage frame. Radio providers commonly put the
+   * current track's artwork URL here (Live365, StreamGuys), but some send a
+   * station or artist page instead — check the value before treating it as art.
+   */
+  url?: string
+  /** Artwork URL the stream tagged as artwork, when it sends one explicitly */
   artworkUrl?: string
 }