react-native-nitro-player 0.5.1 → 0.5.3

package/README.md

@@ -2,6 +2,8 @@
 
 A powerful audio player library for React Native with playlist management, playback controls, and support for Android Auto and CarPlay.
 
+Documentation: [https://nitroplayer.riteshshukla.in/](https://nitroplayer.riteshshukla.in/)
+
 ## Installation
 
 ```bash

package/ios/download/DownloadDatabase.swift

@@ -41,7 +41,7 @@ final class DownloadDatabase {
       let record = DownloadedTrackRecord(
         trackId: track.trackId,
         originalTrack: self.trackItemToRecord(track.originalTrack),
-        localPath: track.localPath,
+        localPath: URL(fileURLWithPath: track.localPath).lastPathComponent,
         localArtworkPath: self.variantToString(track.localArtworkPath),
         downloadedAt: track.downloadedAt,
         fileSize: track.fileSize,
@@ -71,12 +71,13 @@ final class DownloadDatabase {
         return false
       }
       // Verify file still exists
-      let exists = FileManager.default.fileExists(atPath: record.localPath)
+      let absolutePath = resolveAbsolutePath(for: record)
+      let exists = FileManager.default.fileExists(atPath: absolutePath)
       if exists {
-        print("✅ DownloadDatabase: Track \(trackId) IS downloaded at \(record.localPath)")
+        print("✅ DownloadDatabase: Track \(trackId) IS downloaded at \(absolutePath)")
       } else {
         print(
-          "❌ DownloadDatabase: Track \(trackId) record exists but file NOT found at \(record.localPath)"
+          "❌ DownloadDatabase: Track \(trackId) record exists but file NOT found at \(absolutePath)"
         )
       }
       return exists
@@ -129,10 +130,11 @@ final class DownloadDatabase {
         return nil
       }
 
-      print("   Found record, checking file at: \(record.localPath)")
+      let absolutePath = resolveAbsolutePath(for: record)
+      print("   Found record, checking file at: \(absolutePath)")
 
       // Verify file still exists
-      guard FileManager.default.fileExists(atPath: record.localPath) else {
+      guard FileManager.default.fileExists(atPath: absolutePath) else {
         print("   ❌ File does NOT exist, cleaning up record")
         // File was deleted externally, clean up record
         queue.async(flags: .barrier) {
@@ -156,8 +158,9 @@ final class DownloadDatabase {
       var invalidTrackIds: [String] = []
 
       for (trackId, record) in downloadedTracks {
-        print("   Checking track \(trackId) at path: \(record.localPath)")
-        if FileManager.default.fileExists(atPath: record.localPath) {
+        let absolutePath = resolveAbsolutePath(for: record)
+        print("   Checking track \(trackId) at path: \(absolutePath)")
+        if FileManager.default.fileExists(atPath: absolutePath) {
           print("   ✅ File exists")
           validTracks.append(recordToDownloadedTrack(record))
         } else {
@@ -241,8 +244,9 @@ final class DownloadDatabase {
       var trackIdsToRemove: [String] = []
 
       for (trackId, record) in downloadedTracks {
-        if !FileManager.default.fileExists(atPath: record.localPath) {
-          print("   ❌ Missing file for track \(trackId): \(record.localPath)")
+        let absolutePath = resolveAbsolutePath(for: record)
+        if !FileManager.default.fileExists(atPath: absolutePath) {
+          print("   ❌ Missing file for track \(trackId): \(absolutePath)")
           trackIdsToRemove.append(trackId)
         }
       }
@@ -283,7 +287,7 @@ final class DownloadDatabase {
       guard let record = self.downloadedTracks[trackId] else { return }
 
       // Delete the file
-      DownloadFileManager.shared.deleteFile(at: record.localPath)
+      DownloadFileManager.shared.deleteFile(at: self.resolveAbsolutePath(for: record))
 
       // Delete artwork if exists
       if let artworkPath = record.localArtworkPath {
@@ -314,7 +318,7 @@ final class DownloadDatabase {
       // Delete all tracks in the playlist
       for trackId in trackIds {
         if let record = self.downloadedTracks[trackId] {
-          DownloadFileManager.shared.deleteFile(at: record.localPath)
+          DownloadFileManager.shared.deleteFile(at: self.resolveAbsolutePath(for: record))
           if let artworkPath = record.localArtworkPath {
             DownloadFileManager.shared.deleteFile(at: artworkPath)
           }
@@ -333,7 +337,7 @@ final class DownloadDatabase {
     queue.async(flags: .barrier) {
       // Delete all files
       for record in self.downloadedTracks.values {
-        DownloadFileManager.shared.deleteFile(at: record.localPath)
+        DownloadFileManager.shared.deleteFile(at: self.resolveAbsolutePath(for: record))
         if let artworkPath = record.localArtworkPath {
           DownloadFileManager.shared.deleteFile(at: artworkPath)
         }
@@ -376,12 +380,30 @@ final class DownloadDatabase {
           [String: DownloadedTrackRecord].self, from: tracksData)
         print("✅ DownloadDatabase: Loaded \(self.downloadedTracks.count) tracks from disk")
 
+        // Migrate absolute paths → filenames (one-time, for existing installs)
+        var needsMigration = false
+        for (trackId, record) in self.downloadedTracks {
+          if record.localPath.contains("/") {
+            let filename = URL(fileURLWithPath: record.localPath).lastPathComponent
+            self.downloadedTracks[trackId] = DownloadedTrackRecord(
+              trackId: record.trackId,
+              originalTrack: record.originalTrack,
+              localPath: filename,
+              localArtworkPath: record.localArtworkPath,
+              downloadedAt: record.downloadedAt,
+              fileSize: record.fileSize,
+              storageLocation: record.storageLocation
+            )
+            needsMigration = true
+          }
+        }
+        if needsMigration { self.saveToDisk() }
+
         // Log each downloaded track
         for (trackId, record) in self.downloadedTracks {
           print("   📥 \(trackId)")
           print("      Title: \(record.originalTrack.title)")
-          print("      Path: \(record.localPath)")
-          print("      Exists: \(FileManager.default.fileExists(atPath: record.localPath))")
+          print("      Path (filename): \(record.localPath)")
         }
       } catch {
         print("❌ DownloadDatabase: Failed to load tracks from disk: \(error)")
@@ -415,6 +437,11 @@ final class DownloadDatabase {
 
   // MARK: - Conversion Helpers
 
+  private func resolveAbsolutePath(for record: DownloadedTrackRecord) -> String {
+    let location: StorageLocation = record.storageLocation == "private" ? .private : .public
+    return DownloadFileManager.shared.absolutePath(forFilename: record.localPath, storageLocation: location)
+  }
+
   /// Convert Variant_NullType_String? to String?
   private func variantToString(_ variant: Variant_NullType_String?) -> String? {
     guard let variant = variant else { return nil }
@@ -461,7 +488,7 @@ final class DownloadDatabase {
     return DownloadedTrack(
       trackId: record.trackId,
       originalTrack: recordToTrackItem(record.originalTrack),
-      localPath: record.localPath,
+      localPath: resolveAbsolutePath(for: record),
       localArtworkPath: stringToVariant(record.localArtworkPath),
       downloadedAt: record.downloadedAt,
       fileSize: record.fileSize,

package/ios/download/DownloadFileManager.swift

@@ -57,7 +57,8 @@ final class DownloadFileManager {
   func saveDownloadedFile(
     from temporaryLocation: URL, trackId: String, storageLocation: StorageLocation,
     originalURL: String? = nil,
-    suggestedFilename: String? = nil
+    suggestedFilename: String? = nil,
+    httpResponse: HTTPURLResponse? = nil
   ) -> String? {
     print("🎯 DownloadFileManager: saveDownloadedFile called for trackId=\(trackId)")
     print("   From: \(temporaryLocation.path)")
@@ -68,21 +69,12 @@ final class DownloadFileManager {
       storageLocation == .private ? privateDownloadsDirectory : publicDownloadsDirectory
     print("   Destination directory: \(destinationDirectory.path)")
 
-    // Determine file extension
-    var fileExtension = "mp3"  // Default fallback
-
-    if let suggestedFilename = suggestedFilename, !suggestedFilename.isEmpty {
-      let url = URL(fileURLWithPath: suggestedFilename)
-      let pathExtension = url.pathExtension.lowercased()
-      if !pathExtension.isEmpty {
-        fileExtension = pathExtension
-      }
-    } else if let originalURL = originalURL, let url = URL(string: originalURL) {
-      let pathExtension = url.pathExtension.lowercased()
-      if !pathExtension.isEmpty {
-        fileExtension = pathExtension
-      }
-    }
+    // Determine file extension using headers first, then URL path, then default
+    let fileExtension = Self.resolveFileExtension(
+      httpResponse: httpResponse,
+      suggestedFilename: suggestedFilename,
+      originalURL: originalURL
+    )
     print("   File extension: \(fileExtension)")
 
     let fileName = "\(trackId).\(fileExtension)"
@@ -113,6 +105,95 @@ final class DownloadFileManager {
     }
   }
 
+  // MARK: - Extension Resolution
+
+  private static let mimeTypeToExtension: [String: String] = [
+    "audio/mpeg": "mp3",
+    "audio/mp3": "mp3",
+    "audio/mp4": "m4a",
+    "audio/m4a": "m4a",
+    "audio/x-m4a": "m4a",
+    "audio/aac": "aac",
+    "audio/ogg": "ogg",
+    "audio/flac": "flac",
+    "audio/x-flac": "flac",
+    "audio/wav": "wav",
+    "audio/x-wav": "wav",
+    "audio/webm": "webm",
+    "audio/opus": "opus",
+  ]
+
+  /// Resolves the audio file extension from HTTP response headers, suggested filename, or URL.
+  /// Priority: Content-Disposition filename → Content-Type MIME → suggestedFilename → URL path ext → "mp3"
+  private static func resolveFileExtension(
+    httpResponse: HTTPURLResponse?,
+    suggestedFilename: String?,
+    originalURL: String?
+  ) -> String {
+    // 1. Content-Disposition: attachment; filename="track.mp3"
+    if let disposition = httpResponse?.value(forHTTPHeaderField: "Content-Disposition") {
+      if let ext = extensionFromContentDisposition(disposition), !ext.isEmpty {
+        print("   [ExtResolve] Content-Disposition → .\(ext)")
+        return ext
+      }
+    }
+
+    // 2. Content-Type MIME type
+    if let contentType = httpResponse?.value(forHTTPHeaderField: "Content-Type") {
+      let mime = contentType.split(separator: ";").first.map(String.init)?.trimmingCharacters(in: .whitespaces) ?? contentType
+      if let ext = mimeTypeToExtension[mime.lowercased()] {
+        print("   [ExtResolve] Content-Type '\(mime)' → .\(ext)")
+        return ext
+      }
+    }
+
+    // 3. Suggested filename from URLSession
+    if let name = suggestedFilename, !name.isEmpty {
+      let ext = URL(fileURLWithPath: name).pathExtension.lowercased()
+      if !ext.isEmpty && isAudioExtension(ext) {
+        print("   [ExtResolve] suggestedFilename → .\(ext)")
+        return ext
+      }
+    }
+
+    // 4. URL path extension (only if it looks like an audio format, not e.g. ".view")
+    if let urlString = originalURL, let url = URL(string: urlString) {
+      let ext = url.pathExtension.lowercased()
+      if !ext.isEmpty && isAudioExtension(ext) {
+        print("   [ExtResolve] URL path ext → .\(ext)")
+        return ext
+      }
+    }
+
+    print("   [ExtResolve] fallback → .mp3")
+    return "mp3"
+  }
+
+  private static func extensionFromContentDisposition(_ disposition: String) -> String? {
+    // Match: filename="foo.mp3" or filename=foo.mp3
+    let patterns = [
+      #"filename\*?=(?:UTF-8'')?\"?([^\";\r\n]+)\"?"#,
+    ]
+    for pattern in patterns {
+      if let regex = try? NSRegularExpression(pattern: pattern, options: .caseInsensitive) {
+        let range = NSRange(disposition.startIndex..., in: disposition)
+        if let match = regex.firstMatch(in: disposition, range: range),
+          let filenameRange = Range(match.range(at: 1), in: disposition)
+        {
+          let filename = String(disposition[filenameRange]).trimmingCharacters(in: .whitespaces)
+          let ext = URL(fileURLWithPath: filename).pathExtension.lowercased()
+          if !ext.isEmpty { return ext }
+        }
+      }
+    }
+    return nil
+  }
+
+  private static func isAudioExtension(_ ext: String) -> Bool {
+    let audioExtensions: Set<String> = ["mp3", "m4a", "aac", "ogg", "flac", "wav", "webm", "opus", "mp4"]
+    return audioExtensions.contains(ext)
+  }
+
   func deleteFile(at path: String) {
     do {
       if fileManager.fileExists(atPath: path) {
@@ -246,4 +327,11 @@ final class DownloadFileManager {
 
     return nil
   }
+
+  /// Reconstructs the current absolute path for a stored filename and storage location.
+  /// Always uses the current app container path, so it survives container UUID changes.
+  func absolutePath(forFilename filename: String, storageLocation: StorageLocation) -> String {
+    let dir = storageLocation == .private ? privateDownloadsDirectory : publicDownloadsDirectory
+    return dir.appendingPathComponent(filename).path
+  }
 }

package/ios/download/DownloadManagerCore.swift

@@ -682,15 +682,17 @@ extension DownloadManagerCore: URLSessionDownloadDelegate {
       (self.config.storageLocation ?? .private, self.trackMetadata[trackId]?.url)
     }
 
-    // Get suggested filename from response
+    // Get suggested filename and HTTP headers from response
     let suggestedFilename = downloadTask.response?.suggestedFilename
+    let httpResponse = downloadTask.response as? HTTPURLResponse
 
     let destinationPath = DownloadFileManager.shared.saveDownloadedFile(
       from: location,
       trackId: trackId,
       storageLocation: storageLocation,
       originalURL: originalURL,
-      suggestedFilename: suggestedFilename
+      suggestedFilename: suggestedFilename,
+      httpResponse: httpResponse
     )
 
     // Now handle the rest asynchronously

package/package.json

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