react-native-nitro-player 0.5.4 → 0.5.6

package/ios/download/DownloadDatabase.swift

@@ -8,17 +8,17 @@
 import Foundation
 import NitroModules
 
-/// Manages persistence of downloaded track metadata using UserDefaults
+/// Manages persistence of downloaded track metadata using file storage
 final class DownloadDatabase {
 
   // MARK: - Singleton
 
   static let shared = DownloadDatabase()
 
-  // MARK: - Constants
+  // MARK: - Legacy UserDefaults Keys (migration only)
 
-  private static let downloadedTracksKey = "NitroPlayerDownloadedTracks"
-  private static let playlistTracksKey = "NitroPlayerPlaylistTracks"
+  private static let legacyDownloadedTracksKey = "NitroPlayerDownloadedTracks"
+  private static let legacyPlaylistTracksKey = "NitroPlayerPlaylistTracks"
 
   // MARK: - Properties
 
@@ -353,12 +353,21 @@ final class DownloadDatabase {
   private func saveToDisk() {
     do {
       let tracksData = try JSONEncoder().encode(downloadedTracks)
-      UserDefaults.standard.set(tracksData, forKey: Self.downloadedTracksKey)
-
       // Convert Set to Array for encoding
       let playlistTracksDict = playlistTracks.mapValues { Array($0) }
       let playlistData = try JSONEncoder().encode(playlistTracksDict)
-      UserDefaults.standard.set(playlistData, forKey: Self.playlistTracksKey)
+
+      // Combine both into a single JSON wrapper object
+      guard let tracksJson = try JSONSerialization.jsonObject(with: tracksData) as? [String: Any],
+            let playlistJson = try JSONSerialization.jsonObject(with: playlistData) as? [String: Any]
+      else { return }
+
+      let wrapper: [String: Any] = [
+        "downloadedTracks": tracksJson,
+        "playlistTracks": playlistJson,
+      ]
+      let data = try JSONSerialization.data(withJSONObject: wrapper, options: [])
+      try NitroPlayerStorage.write(filename: "downloads.json", data: data)
     } catch {
       NitroPlayerLogger.log("DownloadDatabase", "Failed to save to disk: \(error)")
     }
@@ -369,16 +378,42 @@ final class DownloadDatabase {
     NitroPlayerLogger.log("DownloadDatabase", "📀 LOADING FROM DISK")
     NitroPlayerLogger.log("DownloadDatabase", String(repeating: "📀", count: 40))
 
-    // Load synchronously to ensure data is available immediately
-    // Load downloaded tracks
-    if let tracksData = UserDefaults.standard.data(forKey: Self.downloadedTracksKey) {
+    // 1. Try new JSON file (post-migration)
+    if let data = NitroPlayerStorage.read(filename: "downloads.json") {
+      do {
+        if let wrapper = try JSONSerialization.jsonObject(with: data) as? [String: Any] {
+          if let tracksObj = wrapper["downloadedTracks"] as? [String: Any] {
+            let tracksData = try JSONSerialization.data(withJSONObject: tracksObj)
+            self.downloadedTracks = try JSONDecoder().decode(
+              [String: DownloadedTrackRecord].self, from: tracksData)
+            NitroPlayerLogger.log("DownloadDatabase", "✅ Loaded \(self.downloadedTracks.count) tracks from file")
+          }
+          if let playlistObj = wrapper["playlistTracks"] as? [String: Any] {
+            let playlistData = try JSONSerialization.data(withJSONObject: playlistObj)
+            let playlistTracksDict = try JSONDecoder().decode(
+              [String: [String]].self, from: playlistData)
+            self.playlistTracks = playlistTracksDict.mapValues { Set($0) }
+            NitroPlayerLogger.log("DownloadDatabase", "✅ Loaded \(self.playlistTracks.count) playlist associations from file")
+          }
+        }
+      } catch {
+        NitroPlayerLogger.log("DownloadDatabase", "❌ Failed to load from file: \(error)")
+      }
+      NitroPlayerLogger.log("DownloadDatabase", String(repeating: "📀", count: 40) + "\n")
+      return
+    }
+
+    // 2. Migrate from UserDefaults (one-time, existing installs)
+    var didMigrate = false
+
+    if let tracksData = UserDefaults.standard.data(forKey: Self.legacyDownloadedTracksKey) {
       do {
         self.downloadedTracks = try JSONDecoder().decode(
           [String: DownloadedTrackRecord].self, from: tracksData)
-        NitroPlayerLogger.log("DownloadDatabase", "✅ Loaded \(self.downloadedTracks.count) tracks from disk")
+        NitroPlayerLogger.log("DownloadDatabase", "✅ Migrated \(self.downloadedTracks.count) tracks from UserDefaults")
 
-        // Migrate absolute paths → filenames (one-time, for existing installs)
-        var needsMigration = false
+        // Migrate absolute paths → filenames (pre-existing migration)
+        var needsPathMigration = false
         for (trackId, record) in self.downloadedTracks {
           if record.localPath.contains("/") {
             let filename = URL(fileURLWithPath: record.localPath).lastPathComponent
@@ -391,41 +426,40 @@ final class DownloadDatabase {
               fileSize: record.fileSize,
               storageLocation: record.storageLocation
             )
-            needsMigration = true
+            needsPathMigration = true
           }
         }
-        if needsMigration { self.saveToDisk() }
-
-        // Log each downloaded track
-        for (trackId, record) in self.downloadedTracks {
-          NitroPlayerLogger.log("DownloadDatabase", "   📥 \(trackId)")
-          NitroPlayerLogger.log("DownloadDatabase", "      Title: \(record.originalTrack.title)")
-          NitroPlayerLogger.log("DownloadDatabase", "      Path (filename): \(record.localPath)")
+        if needsPathMigration {
+          NitroPlayerLogger.log("DownloadDatabase", "✅ Migrated absolute paths to filenames")
         }
+
+        UserDefaults.standard.removeObject(forKey: Self.legacyDownloadedTracksKey)
+        didMigrate = true
       } catch {
-        NitroPlayerLogger.log("DownloadDatabase", "❌ Failed to load tracks from disk: \(error)")
+        NitroPlayerLogger.log("DownloadDatabase", "❌ Failed to migrate tracks from UserDefaults: \(error)")
       }
     } else {
       NitroPlayerLogger.log("DownloadDatabase", "⚠️  No saved tracks found in UserDefaults")
     }
 
-    // Load playlist associations
-    if let playlistData = UserDefaults.standard.data(forKey: Self.playlistTracksKey) {
+    if let playlistData = UserDefaults.standard.data(forKey: Self.legacyPlaylistTracksKey) {
       do {
         let playlistTracksDict = try JSONDecoder().decode(
           [String: [String]].self, from: playlistData)
         self.playlistTracks = playlistTracksDict.mapValues { Set($0) }
-        NitroPlayerLogger.log("DownloadDatabase", "✅ Loaded \(self.playlistTracks.count) playlist associations from disk")
-
-        // Log playlist associations
-        for (playlistId, trackIds) in self.playlistTracks {
-          NitroPlayerLogger.log("DownloadDatabase", "   📋 Playlist \(playlistId): \(trackIds.count) tracks")
-        }
+        NitroPlayerLogger.log("DownloadDatabase", "✅ Migrated \(self.playlistTracks.count) playlist associations from UserDefaults")
+        UserDefaults.standard.removeObject(forKey: Self.legacyPlaylistTracksKey)
+        didMigrate = true
       } catch {
-        NitroPlayerLogger.log("DownloadDatabase", "❌ Failed to load playlist tracks from disk: \(error)")
+        NitroPlayerLogger.log("DownloadDatabase", "❌ Failed to migrate playlist tracks from UserDefaults: \(error)")
       }
     } else {
-      NitroPlayerLogger.log("DownloadDatabase", "⚠️  No playlist associations found")
+      NitroPlayerLogger.log("DownloadDatabase", "⚠️  No playlist associations found in UserDefaults")
+    }
+
+    if didMigrate {
+      // Persist migrated data in new file format
+      saveToDisk()
     }
 
     NitroPlayerLogger.log("DownloadDatabase", String(repeating: "📀", count: 40) + "\n")
@@ -456,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,
@@ -463,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,
@@ -476,7 +532,7 @@ final class DownloadDatabase {
       duration: record.duration,
       url: record.url,
       artwork: stringToVariant(record.artwork),
-      extraPayload: nil
+      extraPayload: extraPayload
     )
   }
 
@@ -513,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

@@ -18,8 +18,9 @@ final class DownloadManagerCore: NSObject {
   // MARK: - Constants
 
   private static let backgroundSessionIdentifier = "com.nitroplayer.backgroundDownloads"
-  private static let trackMetadataKey = "NitroPlayerTrackMetadata"
-  private static let playlistAssociationsKey = "NitroPlayerPlaylistAssociations"
+  // Legacy UserDefaults keys (migration only)
+  private static let legacyTrackMetadataKey = "NitroPlayerTrackMetadata"
+  private static let legacyPlaylistAssociationsKey = "NitroPlayerPlaylistAssociations"
 
   // MARK: - Properties
 
@@ -507,48 +508,87 @@ final class DownloadManagerCore: NSObject {
   private func loadPersistedMetadata() {
     NitroPlayerLogger.log("DownloadManagerCore", "📦 Loading persisted metadata...")
 
-    // Load track metadata
-    if let data = UserDefaults.standard.data(forKey: Self.trackMetadataKey) {
+    // 1. Try new JSON file (post-migration)
+    if let data = NitroPlayerStorage.read(filename: "download_metadata.json") {
+      do {
+        if let wrapper = try JSONSerialization.jsonObject(with: data) as? [String: Any] {
+          if let tracksObj = wrapper["trackMetadata"] as? [String: Any] {
+            let tracksData = try JSONSerialization.data(withJSONObject: tracksObj)
+            let records = try JSONDecoder().decode([String: TrackItemRecord].self, from: tracksData)
+            for (trackId, record) in records {
+              trackMetadata[trackId] = recordToTrackItem(record)
+            }
+            NitroPlayerLogger.log("DownloadManagerCore", "   ✅ Loaded \(trackMetadata.count) track metadata entries from file")
+          }
+          if let assocObj = wrapper["playlistAssociations"] as? [String: String] {
+            playlistAssociations = assocObj
+            NitroPlayerLogger.log("DownloadManagerCore", "   ✅ Loaded \(playlistAssociations.count) playlist associations from file")
+          }
+        }
+      } catch {
+        NitroPlayerLogger.log("DownloadManagerCore", "   ❌ Failed to load metadata from file: \(error)")
+      }
+      return
+    }
+
+    // 2. Migrate from UserDefaults (one-time, existing installs)
+    var didMigrate = false
+
+    if let data = UserDefaults.standard.data(forKey: Self.legacyTrackMetadataKey) {
       do {
         let records = try JSONDecoder().decode([String: TrackItemRecord].self, from: data)
         for (trackId, record) in records {
           trackMetadata[trackId] = recordToTrackItem(record)
         }
-        NitroPlayerLogger.log("DownloadManagerCore", "   ✅ Loaded \(trackMetadata.count) track metadata entries")
+        NitroPlayerLogger.log("DownloadManagerCore", "   ✅ Migrated \(trackMetadata.count) track metadata entries from UserDefaults")
+        UserDefaults.standard.removeObject(forKey: Self.legacyTrackMetadataKey)
+        didMigrate = true
       } catch {
-        NitroPlayerLogger.log("DownloadManagerCore", "   ❌ Failed to load track metadata: \(error)")
+        NitroPlayerLogger.log("DownloadManagerCore", "   ❌ Failed to migrate track metadata: \(error)")
       }
     } else {
       NitroPlayerLogger.log("DownloadManagerCore", "   ⚠️ No persisted track metadata found")
     }
 
-    // Load playlist associations
-    if let data = UserDefaults.standard.data(forKey: Self.playlistAssociationsKey) {
+    if let data = UserDefaults.standard.data(forKey: Self.legacyPlaylistAssociationsKey) {
       do {
         playlistAssociations = try JSONDecoder().decode([String: String].self, from: data)
-        NitroPlayerLogger.log("DownloadManagerCore", "   ✅ Loaded \(playlistAssociations.count) playlist associations")
+        NitroPlayerLogger.log("DownloadManagerCore", "   ✅ Migrated \(playlistAssociations.count) playlist associations from UserDefaults")
+        UserDefaults.standard.removeObject(forKey: Self.legacyPlaylistAssociationsKey)
+        didMigrate = true
       } catch {
-        NitroPlayerLogger.log("DownloadManagerCore", "   ❌ Failed to load playlist associations: \(error)")
+        NitroPlayerLogger.log("DownloadManagerCore", "   ❌ Failed to migrate playlist associations: \(error)")
       }
     } else {
       NitroPlayerLogger.log("DownloadManagerCore", "   ⚠️ No persisted playlist associations found")
     }
+
+    if didMigrate {
+      savePersistedMetadata()
+    }
   }
 
   /// Persist track metadata and playlist associations to disk
   private func savePersistedMetadata() {
-    // Convert TrackItem to TrackItemRecord for encoding
     var records: [String: TrackItemRecord] = [:]
     for (trackId, track) in trackMetadata {
       records[trackId] = trackItemToRecord(track)
     }
 
     do {
-      let trackData = try JSONEncoder().encode(records)
-      UserDefaults.standard.set(trackData, forKey: Self.trackMetadataKey)
-
+      let tracksData = try JSONEncoder().encode(records)
       let playlistData = try JSONEncoder().encode(playlistAssociations)
-      UserDefaults.standard.set(playlistData, forKey: Self.playlistAssociationsKey)
+
+      guard let tracksJson = try JSONSerialization.jsonObject(with: tracksData) as? [String: Any],
+            let assocJson = try JSONSerialization.jsonObject(with: playlistData) as? [String: Any]
+      else { return }
+
+      let wrapper: [String: Any] = [
+        "trackMetadata": tracksJson,
+        "playlistAssociations": assocJson,
+      ]
+      let data = try JSONSerialization.data(withJSONObject: wrapper, options: [])
+      try NitroPlayerStorage.write(filename: "download_metadata.json", data: data)
     } catch {
       NitroPlayerLogger.log("DownloadManagerCore", "❌ Failed to save metadata: \(error)")
     }
@@ -573,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,
@@ -580,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,
@@ -594,7 +658,7 @@ final class DownloadManagerCore: NSObject {
       duration: record.duration,
       url: record.url,
       artwork: artwork,
-      extraPayload: nil
+      extraPayload: extraPayload
     )
   }
 
@@ -923,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
+  }
 }