react-native-nitro-player 0.5.5 → 0.5.6

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

@@ -12,7 +12,10 @@ object NitroPlayerLogger {
      * Use trailing lambda syntax: NitroPlayerLogger.log("Tag") { "msg $value" }
      * The lambda is inlined (no heap allocation) and skipped entirely when disabled.
      */
-    inline fun log(header: String = "NitroPlayer", message: () -> String) {
+    inline fun log(
+        header: String = "NitroPlayer",
+        message: () -> String,
+    ) {
         if (isEnabled) {
             Log.d(header, message())
         }
@@ -23,7 +26,10 @@ object NitroPlayerLogger {
      * Note: the String is evaluated at the call site before this function runs.
      * Migrate to the lambda overload for hot paths.
      */
-    fun log(header: String = "NitroPlayer", message: String) {
+    fun log(
+        header: String = "NitroPlayer",
+        message: String,
+    ) {
         if (isEnabled) {
             Log.d(header, message)
         }

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

@@ -698,10 +698,11 @@ class TrackPlayerCore private constructor(
         currentRepeatMode = mode
         if (::player.isInitialized) {
             handler.post {
-                player.repeatMode = when (mode) {
-                    RepeatMode.TRACK -> Player.REPEAT_MODE_ONE
-                    else -> Player.REPEAT_MODE_OFF
-                }
+                player.repeatMode =
+                    when (mode) {
+                        RepeatMode.TRACK -> Player.REPEAT_MODE_ONE
+                        else -> Player.REPEAT_MODE_OFF
+                    }
             }
         }
         NitroPlayerLogger.log("TrackPlayerCore", "🔁 setRepeatMode: $mode")

package/android/src/main/java/com/margelo/nitro/nitroplayer/download/DownloadDatabase.kt

@@ -1,6 +1,7 @@
 package com.margelo.nitro.nitroplayer.download
 
 import android.content.Context
+import com.margelo.nitro.core.AnyMap
 import com.margelo.nitro.core.NullType
 import com.margelo.nitro.nitroplayer.*
 import com.margelo.nitro.nitroplayer.core.NitroPlayerLogger
@@ -18,6 +19,7 @@ class DownloadDatabase private constructor(
 ) {
     companion object {
         private const val TAG = "DownloadDatabase"
+
         // Legacy SharedPreferences keys (migration only)
         private const val LEGACY_PREFS_NAME = "NitroPlayerDownloads"
         private const val LEGACY_KEY_DOWNLOADED_TRACKS = "downloaded_tracks"
@@ -304,10 +306,11 @@ class DownloadDatabase private constructor(
                 playlistJson.put(playlistId, JSONArray(trackIds.toList()))
             }
 
-            val wrapper = JSONObject().apply {
-                put("downloadedTracks", tracksJson)
-                put("playlistTracks", playlistJson)
-            }
+            val wrapper =
+                JSONObject().apply {
+                    put("downloadedTracks", tracksJson)
+                    put("playlistTracks", playlistJson)
+                }
             NitroPlayerStorage.write(context, "downloads.json", wrapper.toString())
         } catch (e: Exception) {
             e.printStackTrace()
@@ -390,8 +393,14 @@ class DownloadDatabase private constructor(
     }
 
     // Conversion Helpers
-    private fun trackItemToRecord(track: TrackItem): TrackItemRecord =
-        TrackItemRecord(
+    private fun trackItemToRecord(track: TrackItem): TrackItemRecord {
+        val extraPayloadJson =
+            track.extraPayload?.let { payload ->
+                val extraPayloadMap = payload.toHashMap()
+                JSONObject(extraPayloadMap)
+            }
+
+        return TrackItemRecord(
             id = track.id,
             title = track.title,
             artist = track.artist,
@@ -399,7 +408,9 @@ class DownloadDatabase private constructor(
             duration = track.duration,
             url = track.url,
             artwork = track.artwork?.asSecondOrNull(),
+            extraPayload = extraPayloadJson,
         )
+    }
 
     private fun recordToTrackItem(record: TrackItemRecord): TrackItem {
         val artworkVariant =
@@ -409,6 +420,21 @@ class DownloadDatabase private constructor(
                 null
             }
 
+        val extraPayload: AnyMap? =
+            record.extraPayload?.let { extraPayloadJson ->
+                val map = AnyMap()
+                val keyIterator = extraPayloadJson.keys()
+                while (keyIterator.hasNext()) {
+                    val key = keyIterator.next()
+                    when (val value = extraPayloadJson.get(key)) {
+                        is String -> map.setString(key, value)
+                        is Number -> map.setDouble(key, value.toDouble())
+                        is Boolean -> map.setBoolean(key, value)
+                    }
+                }
+                map
+            }
+
         return TrackItem(
             id = record.id,
             title = record.title,
@@ -417,7 +443,7 @@ class DownloadDatabase private constructor(
             duration = record.duration,
             url = record.url,
             artwork = artworkVariant,
-            extraPayload = null,
+            extraPayload = extraPayload,
         )
     }
 
@@ -440,15 +466,14 @@ class DownloadDatabase private constructor(
         )
     }
 
-    private fun convertPlaylistManagerToNitro(playlist: com.margelo.nitro.nitroplayer.playlist.Playlist): Playlist {
-        return Playlist(
+    private fun convertPlaylistManagerToNitro(playlist: com.margelo.nitro.nitroplayer.playlist.Playlist): Playlist =
+        Playlist(
             id = playlist.id,
             name = playlist.name,
             description = null,
             artwork = null,
             tracks = playlist.tracks.toTypedArray(),
         )
-    }
 }
 
 // Internal record classes
@@ -494,6 +519,7 @@ internal data class TrackItemRecord(
     val duration: Double,
     val url: String,
     val artwork: String?,
+    val extraPayload: JSONObject?,
 ) {
     fun toJson(): JSONObject =
         JSONObject().apply {
@@ -504,6 +530,7 @@ internal data class TrackItemRecord(
             put("duration", duration)
             put("url", url)
             put("artwork", artwork)
+            put("extraPayload", extraPayload)
         }
 
     companion object {
@@ -516,6 +543,12 @@ internal data class TrackItemRecord(
                 duration = json.getDouble("duration"),
                 url = json.getString("url"),
                 artwork = if (json.isNull("artwork")) null else json.getString("artwork"),
+                extraPayload =
+                    if (json.has("extraPayload") && !json.isNull("extraPayload")) {
+                        json.getJSONObject("extraPayload")
+                    } else {
+                        null
+                    },
             )
     }
 }

package/android/src/main/java/com/margelo/nitro/nitroplayer/playlist/PlaylistManager.kt

@@ -405,10 +405,11 @@ class PlaylistManager private constructor(
                 }
             }
 
-            val wrapper = JSONObject().apply {
-                put("playlists", jsonArray)
-                put("currentPlaylistId", currentPlaylistId)
-            }
+            val wrapper =
+                JSONObject().apply {
+                    put("playlists", jsonArray)
+                    put("currentPlaylistId", currentPlaylistId)
+                }
             NitroPlayerStorage.write(context, "playlists.json", wrapper.toString())
         } catch (e: Exception) {
             e.printStackTrace()
@@ -423,8 +424,12 @@ class PlaylistManager private constructor(
                 val wrapper = JSONObject(json)
                 val jsonArray = wrapper.optJSONArray("playlists") ?: JSONArray()
                 parseAndLoadPlaylists(jsonArray)
-                currentPlaylistId = if (wrapper.isNull("currentPlaylistId")) null
-                                    else wrapper.optString("currentPlaylistId", null.toString()).takeIf { it != "null" }
+                currentPlaylistId =
+                    if (wrapper.isNull("currentPlaylistId")) {
+                        null
+                    } else {
+                        wrapper.optString("currentPlaylistId", null.toString()).takeIf { it != "null" }
+                    }
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -440,7 +445,11 @@ class PlaylistManager private constructor(
                 parseAndLoadPlaylists(jsonArray)
                 currentPlaylistId = prefs.getString("currentPlaylistId", null)
                 // Remove old SharedPreferences data to free space
-                prefs.edit().remove("playlists").remove("currentPlaylistId").apply()
+                prefs
+                    .edit()
+                    .remove("playlists")
+                    .remove("currentPlaylistId")
+                    .apply()
                 // Persist in new format
                 saveToFile()
             } catch (e: Exception) {

package/android/src/main/java/com/margelo/nitro/nitroplayer/storage/NitroPlayerStorage.kt

@@ -9,7 +9,10 @@ object NitroPlayerStorage {
     private const val DIR_NAME = "nitroplayer"
 
     /** Reads the contents of [filename] from the NitroPlayer storage directory, or null if absent. */
-    fun read(context: Context, filename: String): String? {
+    fun read(
+        context: Context,
+        filename: String,
+    ): String? {
         val file = File(storageDirectory(context), filename)
         return if (file.exists()) {
             try {
@@ -28,7 +31,11 @@ object NitroPlayerStorage {
      * Writes to `<filename>.tmp` first, then renames — leaving the prior file
      * untouched on failure (crash-safe).
      */
-    fun write(context: Context, filename: String, json: String) {
+    fun write(
+        context: Context,
+        filename: String,
+        json: String,
+    ) {
         try {
             val dir = storageDirectory(context)
             dir.mkdirs()

package/ios/download/DownloadDatabase.swift

@@ -490,6 +490,11 @@ final class DownloadDatabase {
   }
 
   private func trackItemToRecord(_ track: TrackItem) -> TrackItemRecord {
+    var extraPayloadDict: [String: Any]? = nil
+    if let extraPayload = track.extraPayload {
+      extraPayloadDict = extraPayload.toDictionary()
+    }
+
     return TrackItemRecord(
       id: track.id,
       title: track.title,
@@ -497,11 +502,28 @@ final class DownloadDatabase {
       album: track.album,
       duration: track.duration,
       url: track.url,
-      artwork: variantToString(track.artwork)
+      artwork: variantToString(track.artwork),
+      extraPayload: extraPayloadDict
     )
   }
 
   private func recordToTrackItem(_ record: TrackItemRecord) -> TrackItem {
+    var extraPayload: AnyMap? = nil
+    if let extraPayloadDict = record.extraPayload {
+      extraPayload = AnyMap()
+      for (key, value) in extraPayloadDict {
+        if let stringValue = value as? String {
+          extraPayload?.setString(key: key, value: stringValue)
+        } else if let doubleValue = value as? Double {
+          extraPayload?.setDouble(key: key, value: doubleValue)
+        } else if let intValue = value as? Int {
+          extraPayload?.setDouble(key: key, value: Double(intValue))
+        } else if let boolValue = value as? Bool {
+          extraPayload?.setBoolean(key: key, value: boolValue)
+        }
+      }
+    }
+
     return TrackItem(
       id: record.id,
       title: record.title,
@@ -510,7 +532,7 @@ final class DownloadDatabase {
       duration: record.duration,
       url: record.url,
       artwork: stringToVariant(record.artwork),
-      extraPayload: nil
+      extraPayload: extraPayload
     )
   }
 
@@ -547,4 +569,59 @@ private struct TrackItemRecord: Codable {
   let duration: Double
   let url: String
   let artwork: String?
+  let extraPayload: [String: Any]?
+
+  enum CodingKeys: String, CodingKey {
+    case id, title, artist, album, duration, url, artwork, extraPayload
+  }
+
+  // Manual encoding to handle [String: Any]
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(id, forKey: .id)
+    try container.encode(title, forKey: .title)
+    try container.encode(artist, forKey: .artist)
+    try container.encode(album, forKey: .album)
+    try container.encode(duration, forKey: .duration)
+    try container.encode(url, forKey: .url)
+    try container.encodeIfPresent(artwork, forKey: .artwork)
+
+    if let extraPayload = extraPayload {
+      let jsonData = try JSONSerialization.data(withJSONObject: extraPayload)
+      if let jsonString = String(data: jsonData, encoding: .utf8) {
+        try container.encode(jsonString, forKey: .extraPayload)
+      }
+    }
+  }
+
+  // Manual decoding to handle [String: Any]
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    id = try container.decode(String.self, forKey: .id)
+    title = try container.decode(String.self, forKey: .title)
+    artist = try container.decode(String.self, forKey: .artist)
+    album = try container.decode(String.self, forKey: .album)
+    duration = try container.decode(Double.self, forKey: .duration)
+    url = try container.decode(String.self, forKey: .url)
+    artwork = try container.decodeIfPresent(String.self, forKey: .artwork)
+
+    if let jsonString = try? container.decodeIfPresent(String.self, forKey: .extraPayload),
+       let jsonData = jsonString.data(using: .utf8) {
+      extraPayload = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any]
+    } else {
+      extraPayload = nil
+    }
+  }
+
+  // Initializer for code creation
+  init(id: String, title: String, artist: String, album: String, duration: Double, url: String, artwork: String?, extraPayload: [String: Any]?) {
+    self.id = id
+    self.title = title
+    self.artist = artist
+    self.album = album
+    self.duration = duration
+    self.url = url
+    self.artwork = artwork
+    self.extraPayload = extraPayload
+  }
 }

package/ios/download/DownloadManagerCore.swift

@@ -613,6 +613,12 @@ final class DownloadManagerCore: NSObject {
         artworkString = value
       }
     }
+
+    var extraPayloadDict: [String: Any]? = nil
+    if let extraPayload = track.extraPayload {
+      extraPayloadDict = extraPayload.toDictionary()
+    }
+
     return TrackItemRecord(
       id: track.id,
       title: track.title,
@@ -620,12 +626,30 @@ final class DownloadManagerCore: NSObject {
       album: track.album,
       duration: track.duration,
       url: track.url,
-      artwork: artworkString
+      artwork: artworkString,
+      extraPayload: extraPayloadDict
     )
   }
 
   private func recordToTrackItem(_ record: TrackItemRecord) -> TrackItem {
     let artwork: Variant_NullType_String? = record.artwork.map { .second($0) }
+
+    var extraPayload: AnyMap? = nil
+    if let extraPayloadDict = record.extraPayload {
+      extraPayload = AnyMap()
+      for (key, value) in extraPayloadDict {
+        if let stringValue = value as? String {
+          extraPayload?.setString(key: key, value: stringValue)
+        } else if let doubleValue = value as? Double {
+          extraPayload?.setDouble(key: key, value: doubleValue)
+        } else if let intValue = value as? Int {
+          extraPayload?.setDouble(key: key, value: Double(intValue))
+        } else if let boolValue = value as? Bool {
+          extraPayload?.setBoolean(key: key, value: boolValue)
+        }
+      }
+    }
+
     return TrackItem(
       id: record.id,
       title: record.title,
@@ -634,7 +658,7 @@ final class DownloadManagerCore: NSObject {
       duration: record.duration,
       url: record.url,
       artwork: artwork,
-      extraPayload: nil
+      extraPayload: extraPayload
     )
   }
 
@@ -963,4 +987,59 @@ private struct TrackItemRecord: Codable {
   let duration: Double
   let url: String
   let artwork: String?
+  let extraPayload: [String: Any]?
+
+  enum CodingKeys: String, CodingKey {
+    case id, title, artist, album, duration, url, artwork, extraPayload
+  }
+
+  // Manual encoding to handle [String: Any]
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(id, forKey: .id)
+    try container.encode(title, forKey: .title)
+    try container.encode(artist, forKey: .artist)
+    try container.encode(album, forKey: .album)
+    try container.encode(duration, forKey: .duration)
+    try container.encode(url, forKey: .url)
+    try container.encodeIfPresent(artwork, forKey: .artwork)
+
+    if let extraPayload = extraPayload {
+      let jsonData = try JSONSerialization.data(withJSONObject: extraPayload)
+      if let jsonString = String(data: jsonData, encoding: .utf8) {
+        try container.encode(jsonString, forKey: .extraPayload)
+      }
+    }
+  }
+
+  // Manual decoding to handle [String: Any]
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    id = try container.decode(String.self, forKey: .id)
+    title = try container.decode(String.self, forKey: .title)
+    artist = try container.decode(String.self, forKey: .artist)
+    album = try container.decode(String.self, forKey: .album)
+    duration = try container.decode(Double.self, forKey: .duration)
+    url = try container.decode(String.self, forKey: .url)
+    artwork = try container.decodeIfPresent(String.self, forKey: .artwork)
+
+    if let jsonString = try? container.decodeIfPresent(String.self, forKey: .extraPayload),
+       let jsonData = jsonString.data(using: .utf8) {
+      extraPayload = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any]
+    } else {
+      extraPayload = nil
+    }
+  }
+
+  // Initializer for code creation
+  init(id: String, title: String, artist: String, album: String, duration: Double, url: String, artwork: String?, extraPayload: [String: Any]?) {
+    self.id = id
+    self.title = title
+    self.artist = artist
+    self.album = album
+    self.duration = duration
+    self.url = url
+    self.artwork = artwork
+    self.extraPayload = extraPayload
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-player",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "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",