react-native-nitro-player 0.5.7 → 0.5.9-alpha.0

package/ios/download/DownloadDatabase.swift

@@ -82,6 +82,12 @@ final class DownloadDatabase {
     }
   }
 
+  private func _isTrackDownloadedUnsafe(trackId: String) -> Bool {
+    guard let record = downloadedTracks[trackId] else { return false }
+    let absolutePath = resolveAbsolutePath(for: record)
+    return FileManager.default.fileExists(atPath: absolutePath)
+  }
+
   func isPlaylistDownloaded(playlistId: String) -> Bool {
     return queue.sync {
       guard let trackIds = playlistTracks[playlistId], !trackIds.isEmpty else { return false }
@@ -93,7 +99,7 @@ final class DownloadDatabase {
 
       // Check if all tracks are downloaded
       for track in playlistModel.tracks {
-        if !isTrackDownloaded(trackId: track.id) {
+        if !_isTrackDownloadedUnsafe(trackId: track.id) {
           return false
         }
       }
@@ -108,7 +114,7 @@ final class DownloadDatabase {
 
       // Check if at least one track is downloaded
       for trackId in trackIds {
-        if isTrackDownloaded(trackId: trackId) {
+        if _isTrackDownloadedUnsafe(trackId: trackId) {
           return true
         }
       }

package/ios/download/DownloadFileManager.swift

@@ -304,8 +304,18 @@ final class DownloadFileManager {
     return bytesFreed
   }
 
+  private static let commonAudioExtensions = ["mp3", "m4a", "aac", "wav", "flac", "ogg", "opus", "mp4"]
+
   func getLocalPath(for trackId: String) -> String? {
-    // Check private directory first
+    // Try common extensions first (fast O(1) path)
+    for ext in Self.commonAudioExtensions {
+      let privatePath = privateDownloadsDirectory.appendingPathComponent("\(trackId).\(ext)").path
+      if fileManager.fileExists(atPath: privatePath) { return privatePath }
+      let publicPath = publicDownloadsDirectory.appendingPathComponent("\(trackId).\(ext)").path
+      if fileManager.fileExists(atPath: publicPath) { return publicPath }
+    }
+
+    // Fallback to directory enumeration for uncommon extensions
     let privateFiles =
       (try? fileManager.contentsOfDirectory(
         at: privateDownloadsDirectory, includingPropertiesForKeys: nil)) ?? []
@@ -315,7 +325,6 @@ final class DownloadFileManager {
       }
     }
 
-    // Check public directory
     let publicFiles =
       (try? fileManager.contentsOfDirectory(
         at: publicDownloadsDirectory, includingPropertiesForKeys: nil)) ?? []

package/ios/download/DownloadManagerCore.swift

@@ -58,6 +58,9 @@ final class DownloadManagerCore: NSObject {
   /// Playlist associations (downloadId -> playlistId)
   private var playlistAssociations: [String: String] = [:]
 
+  /// Cached parsed (downloadId, trackId) tuples per task description to avoid repeated string splitting
+  private var parsedDescriptionCache: [String: (downloadId: String, trackId: String)] = [:]
+
   /// Background completion handler from AppDelegate
   var backgroundCompletionHandler: (() -> Void)?
 
@@ -258,10 +261,50 @@ final class DownloadManagerCore: NSObject {
     }
   }
 
+  private func _pauseDownloadUnsafe(downloadId: String) {
+    guard let task = self.activeTasks[downloadId] else { return }
+    task.cancel(byProducingResumeData: { resumeData in
+      self.taskMetadata[downloadId]?.resumeData = resumeData
+    })
+    self.taskMetadata[downloadId]?.state = .paused
+    if let trackId = self.taskMetadata[downloadId]?.trackId {
+      self.notifyStateChange(downloadId: downloadId, trackId: trackId, state: .paused, error: nil)
+    }
+  }
+
+  private func _resumeDownloadUnsafe(downloadId: String) {
+    guard let metadata = self.taskMetadata[downloadId] else { return }
+    var task: URLSessionDownloadTask
+    if let resumeData = metadata.resumeData {
+      task = self.backgroundSession.downloadTask(withResumeData: resumeData)
+    } else if let track = self.trackMetadata[metadata.trackId],
+              let url = URL(string: track.url) {
+      task = self.backgroundSession.downloadTask(with: url)
+    } else { return }
+    task.taskDescription = "\(downloadId)|\(metadata.trackId)"
+    self.activeTasks[downloadId] = task
+    self.taskMetadata[downloadId]?.state = .downloading
+    self.taskMetadata[downloadId]?.resumeData = nil
+    task.resume()
+    self.notifyStateChange(downloadId: downloadId, trackId: metadata.trackId, state: .downloading, error: nil)
+  }
+
+  private func _cancelDownloadUnsafe(downloadId: String) {
+    guard let task = self.activeTasks[downloadId] else { return }
+    task.cancel()
+    if let trackId = self.taskMetadata[downloadId]?.trackId {
+      self.taskMetadata[downloadId]?.state = .cancelled
+      self.notifyStateChange(downloadId: downloadId, trackId: trackId, state: .cancelled, error: nil)
+      self.cleanupPersistedMetadata(trackId: trackId, downloadId: downloadId)
+    }
+    self.activeTasks.removeValue(forKey: downloadId)
+    self.taskMetadata.removeValue(forKey: downloadId)
+  }
+
   func pauseAllDownloads() {
     queue.async(flags: .barrier) {
       for downloadId in self.activeTasks.keys {
-        self.pauseDownload(downloadId: downloadId)
+        self._pauseDownloadUnsafe(downloadId: downloadId)
       }
     }
   }
@@ -270,7 +313,7 @@ final class DownloadManagerCore: NSObject {
     queue.async(flags: .barrier) {
       for downloadId in self.taskMetadata.keys where self.taskMetadata[downloadId]?.state == .paused
       {
-        self.resumeDownload(downloadId: downloadId)
+        self._resumeDownloadUnsafe(downloadId: downloadId)
       }
     }
   }
@@ -278,7 +321,7 @@ final class DownloadManagerCore: NSObject {
   func cancelAllDownloads() {
     queue.async(flags: .barrier) {
       for downloadId in self.activeTasks.keys {
-        self.cancelDownload(downloadId: downloadId)
+        self._cancelDownloadUnsafe(downloadId: downloadId)
       }
     }
   }
@@ -302,15 +345,24 @@ final class DownloadManagerCore: NSObject {
 
   func getQueueStatus() -> DownloadQueueStatus {
     return queue.sync {
-      let metadata = Array(taskMetadata.values)
+      var pendingCount = 0
+      var activeCount = 0
+      var failedCount = 0
+      var totalBytes = 0.0
+      var downloadedBytes = 0.0
+
+      for m in taskMetadata.values {
+        switch m.state {
+        case .pending: pendingCount += 1
+        case .downloading: activeCount += 1
+        case .failed: failedCount += 1
+        default: break
+        }
+        totalBytes += m.totalBytes ?? 0
+        downloadedBytes += m.bytesDownloaded
+      }
 
-      let pendingCount = metadata.filter { $0.state == .pending }.count
-      let activeCount = metadata.filter { $0.state == .downloading }.count
       let completedCount = DownloadDatabase.shared.getAllDownloadedTracks().count
-      let failedCount = metadata.filter { $0.state == .failed }.count
-
-      let totalBytes = metadata.reduce(0.0) { $0 + ($1.totalBytes ?? 0) }
-      let downloadedBytes = metadata.reduce(0.0) { $0 + $1.bytesDownloaded }
 
       return DownloadQueueStatus(
         pendingCount: Double(pendingCount),
@@ -601,6 +653,17 @@ final class DownloadManagerCore: NSObject {
     savePersistedMetadata()
   }
 
+  private func parseTaskDescription(_ description: String) -> (downloadId: String, trackId: String)? {
+    if let cached = parsedDescriptionCache[description] {
+      return cached
+    }
+    let parts = description.split(separator: "|")
+    guard parts.count == 2 else { return nil }
+    let result = (downloadId: String(parts[0]), trackId: String(parts[1]))
+    parsedDescriptionCache[description] = result
+    return result
+  }
+
   // MARK: - TrackItem Serialization
 
   private func trackItemToRecord(_ track: TrackItem) -> TrackItemRecord {
@@ -725,14 +788,13 @@ extension DownloadManagerCore: URLSessionDownloadDelegate {
       NitroPlayerLogger.log("DownloadManagerCore", "❌ No task description")
       return
     }
-    let parts = description.split(separator: "|")
-    guard parts.count == 2 else {
+    guard let parsed = parseTaskDescription(description) else {
       NitroPlayerLogger.log("DownloadManagerCore", "❌ Invalid task description format: \(description)")
       return
     }
 
-    let downloadId = String(parts[0])
-    let trackId = String(parts[1])
+    let downloadId = parsed.downloadId
+    let trackId = parsed.trackId
 
       NitroPlayerLogger.log("DownloadManagerCore", "🎯 Processing completion for downloadId=\(downloadId), trackId=\(trackId)")
 
@@ -834,12 +896,11 @@ extension DownloadManagerCore: URLSessionDownloadDelegate {
     _ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64,
     totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64
   ) {
-    guard let description = downloadTask.taskDescription else { return }
-    let parts = description.split(separator: "|")
-    guard parts.count == 2 else { return }
+    guard let description = downloadTask.taskDescription,
+          let parsed = parseTaskDescription(description) else { return }
 
-    let downloadId = String(parts[0])
-    let trackId = String(parts[1])
+    let downloadId = parsed.downloadId
+    let trackId = parsed.trackId
 
     queue.async(flags: .barrier) {
       self.taskMetadata[downloadId]?.bytesDownloaded = Double(totalBytesWritten)
@@ -862,14 +923,12 @@ extension DownloadManagerCore: URLSessionDownloadDelegate {
 
   func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
     guard let downloadTask = task as? URLSessionDownloadTask,
-      let description = downloadTask.taskDescription
+      let description = downloadTask.taskDescription,
+      let parsed = parseTaskDescription(description)
     else { return }
 
-    let parts = description.split(separator: "|")
-    guard parts.count == 2 else { return }
-
-    let downloadId = String(parts[0])
-    let trackId = String(parts[1])
+    let downloadId = parsed.downloadId
+    let trackId = parsed.trackId
 
     guard let error = error else { return }  // Success case handled in didFinishDownloadingTo
 

package/ios/equalizer/EqualizerCore.swift

@@ -28,6 +28,8 @@ class EqualizerCore {
 
   // Current gains storage - internal so TapContext can access
   private(set) var currentGains: [Double] = [0, 0, 0, 0, 0]
+  private var cachedBands: [EqualizerBand]?
+  private var cachedCustomPresets: [EqualizerPreset]?
 
   // Dirty flag: set when gains change so TapContext only recalculates when needed
   var gainsDirty: Bool = true
@@ -174,7 +176,8 @@ class EqualizerCore {
   }
 
   func getBands() -> [EqualizerBand] {
-    return (0..<5).map { i in
+    if let cached = cachedBands { return cached }
+    let bands = (0..<5).map { i in
       EqualizerBand(
         index: Double(i),
         centerFrequency: Double(frequencies[i]),
@@ -182,6 +185,8 @@ class EqualizerCore {
         frequencyLabel: frequencyLabels[i]
       )
     }
+    cachedBands = bands
+    return bands
   }
 
   func setBandGain(bandIndex: Int, gainDb: Double) -> Bool {
@@ -189,6 +194,7 @@ class EqualizerCore {
 
     let clampedGain = max(-12.0, min(12.0, gainDb))
     currentGains[bandIndex] = clampedGain
+    cachedBands = nil
     gainsDirty = true
 
     currentPresetName = nil
@@ -207,6 +213,7 @@ class EqualizerCore {
     for i in 0..<5 {
       currentGains[i] = max(-12.0, min(12.0, gains[i]))
     }
+    cachedBands = nil
     gainsDirty = true
 
     notifyBandChange(getBands())
@@ -231,15 +238,18 @@ class EqualizerCore {
   }
 
   func getCustomPresets() -> [EqualizerPreset] {
+    if let cached = cachedCustomPresets { return cached }
     guard let data = UserDefaults.standard.data(forKey: customPresetsKey),
       let presets = try? JSONDecoder().decode([String: [Double]].self, from: data)
     else {
       return []
     }
 
-    return presets.map { name, gains in
+    let result = presets.map { name, gains in
       EqualizerPreset(name: name, gains: gains, type: .custom)
     }
+    cachedCustomPresets = result
+    return result
   }
 
   func applyPreset(_ presetName: String) -> Bool {
@@ -292,6 +302,7 @@ class EqualizerCore {
 
     if let data = try? JSONEncoder().encode(presets) {
       UserDefaults.standard.set(data, forKey: customPresetsKey)
+      cachedCustomPresets = nil
       currentPresetName = name
       notifyPresetChange(name)
       saveCurrentPreset(name)
@@ -321,6 +332,7 @@ class EqualizerCore {
 
     if let data = try? JSONEncoder().encode(presets) {
       UserDefaults.standard.set(data, forKey: customPresetsKey)
+      cachedCustomPresets = nil
 
       if currentPresetName == name {
         currentPresetName = nil

package/ios/media/MediaSessionManager.swift

@@ -21,7 +21,7 @@ class MediaSessionManager {
   // MARK: - Properties
 
   private var trackPlayerCore: TrackPlayerCore?
-  private var artworkCache: [String: UIImage] = [:]
+  private let artworkCache = NSCache<NSString, UIImage>()
 
   private var showInNotification: Bool = true
 
@@ -135,7 +135,7 @@ class MediaSessionManager {
     // Artwork: use cache synchronously when available, otherwise kick off async load
     if let artwork = track.artwork, case .second(let artworkUrl) = artwork {
       lastArtworkUrl = artworkUrl
-      if let cachedImage = artworkCache[artworkUrl] {
+      if let cachedImage = artworkCache.object(forKey: artworkUrl as NSString) {
         nowPlayingInfo[MPMediaItemPropertyArtwork] = MPMediaItemArtwork(
           boundsSize: CGSize(width: Constants.artworkSize, height: Constants.artworkSize),
           requestHandler: { _ in cachedImage }
@@ -285,7 +285,7 @@ class MediaSessionManager {
   }
 
   private func loadArtwork(url: String, completion: @escaping (UIImage?) -> Void) {
-    if let cached = artworkCache[url] {
+    if let cached = artworkCache.object(forKey: url as NSString) {
       completion(cached)
       return
     }
@@ -301,7 +301,7 @@ class MediaSessionManager {
         return
       }
       DispatchQueue.main.async {
-        self?.artworkCache[url] = image
+        self?.artworkCache.setObject(image, forKey: url as NSString)
         completion(image)
       }
     }.resume()
@@ -310,6 +310,6 @@ class MediaSessionManager {
   func release() {
     clearNowPlayingInfo()
     disableAllCommands()
-    artworkCache.removeAll()
+    artworkCache.removeAllObjects()
   }
 }

package/ios/playlist/PlaylistModel.swift

@@ -15,7 +15,7 @@ class PlaylistModel {
   let name: String
   let description: String?
   let artwork: String?
-  var tracks: [TrackItem]
+  let tracks: [TrackItem]
 
   init(
     id: String, name: String, description: String? = nil, artwork: String? = nil,

package/ios/queue/HybridPlayerQueue.swift

@@ -77,6 +77,7 @@ final class HybridPlayerQueue: HybridPlayerQueueSpec {
 
   func onPlaylistsChanged(callback: @escaping ([Playlist], QueueOperation?) -> Void) throws {
     // Store callback in static storage so it persists across HybridPlayerQueue instances
+    HybridPlayerQueue.playlistsChangeCallbacks.removeAll()
     HybridPlayerQueue.playlistsChangeCallbacks.append(callback)
 
     // Register a single listener with PlaylistManager that dispatches to all callbacks
@@ -94,6 +95,7 @@ final class HybridPlayerQueue: HybridPlayerQueueSpec {
 
   func onPlaylistChanged(callback: @escaping (String, Playlist, QueueOperation?) -> Void) throws {
     // Store callback in static storage so it persists across HybridPlayerQueue instances
+    HybridPlayerQueue.playlistChangeCallbacks.removeAll()
     HybridPlayerQueue.playlistChangeCallbacks.append(callback)
 
     // Register listeners for all existing playlists (only once per playlist)

package/ios/storage/NitroPlayerStorage.swift

@@ -35,10 +35,12 @@ enum NitroPlayerStorage {
   /// Uses `FileManager` APIs — never hardcodes the UUID-based container path
   /// so this resolves correctly regardless of which device or simulator the
   /// app runs on.
-  private static func storageDirectory() -> URL {
+  private static let storageDir: URL = {
     let appSupport = FileManager.default.urls(
       for: .applicationSupportDirectory, in: .userDomainMask
     ).first!
     return appSupport.appendingPathComponent("NitroPlayer", isDirectory: true)
-  }
+  }()
+
+  private static func storageDirectory() -> URL { storageDir }
 }

package/lib/hooks/useDownloadProgress.js

@@ -43,17 +43,24 @@ export function useDownloadProgress(options = {}) {
         const unsubscribe = downloadCallbackManager.subscribeToProgress((progress) => {
             if (!isMounted.current)
                 return;
+            const isTerminal = progress.state === 'completed' || progress.state === 'cancelled';
+            if (isTerminal) {
+                // Always clean up terminal downloads from the map regardless of activeOnly,
+                // otherwise completed downloads are never removed when activeOnly=true
+                setProgressMap((prev) => {
+                    if (!prev.has(progress.trackId))
+                        return prev;
+                    const next = new Map(prev);
+                    next.delete(progress.trackId);
+                    return next;
+                });
+                return;
+            }
             if (!shouldTrack(progress))
                 return;
             setProgressMap((prev) => {
                 const next = new Map(prev);
-                if (progress.state === 'completed' ||
-                    progress.state === 'cancelled') {
-                    next.delete(progress.trackId);
-                }
-                else {
-                    next.set(progress.trackId, progress);
-                }
+                next.set(progress.trackId, progress);
                 return next;
             });
         });

package/nitrogen/generated/android/NitroPlayer+autolinking.cmake

@@ -2,7 +2,7 @@
 # NitroPlayer+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroPlayer+autolinking.gradle

@@ -2,7 +2,7 @@
 /// NitroPlayer+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/NitroPlayerOnLoad.cpp

@@ -2,7 +2,7 @@
 /// NitroPlayerOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_NITROPLAYER_WITH_GENERATED_CMAKE_PROJECT
@@ -39,82 +39,85 @@
 namespace margelo::nitro::nitroplayer {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::nitroplayer::registerAllNatives();
+  });
+}
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::nitroplayer;
-  using namespace facebook;
 
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::nitroplayer::JHybridAndroidAutoMediaLibrarySpec::registerNatives();
-    margelo::nitro::nitroplayer::JHybridAudioDevicesSpec::registerNatives();
-    margelo::nitro::nitroplayer::JHybridDownloadManagerSpec::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_DownloadProgress_cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_std__string_std__string_DownloadState_std__optional_DownloadError__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_DownloadedTrack_cxx::registerNatives();
-    margelo::nitro::nitroplayer::JHybridEqualizerSpec::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_bool_cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_std__vector_EqualizerBand__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_std__optional_std__variant_nitro__NullType__std__string___cxx::registerNatives();
-    margelo::nitro::nitroplayer::JHybridPlayerQueueSpec::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_std__vector_Playlist__std__optional_QueueOperation__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_std__string_Playlist_std__optional_QueueOperation__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JHybridTrackPlayerSpec::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_TrackItem_std__optional_Reason__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_TrackPlayerState_std__optional_Reason__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_double_double_cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_double_double_std__optional_bool__cxx::registerNatives();
-    margelo::nitro::nitroplayer::JFunc_void_std__vector_TrackItem__double_cxx::registerNatives();
+  // Register native JNI methods
+  margelo::nitro::nitroplayer::JHybridAndroidAutoMediaLibrarySpec::registerNatives();
+  margelo::nitro::nitroplayer::JHybridAudioDevicesSpec::registerNatives();
+  margelo::nitro::nitroplayer::JHybridDownloadManagerSpec::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_DownloadProgress_cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_std__string_std__string_DownloadState_std__optional_DownloadError__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_DownloadedTrack_cxx::registerNatives();
+  margelo::nitro::nitroplayer::JHybridEqualizerSpec::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_bool_cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_std__vector_EqualizerBand__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_std__optional_std__variant_nitro__NullType__std__string___cxx::registerNatives();
+  margelo::nitro::nitroplayer::JHybridPlayerQueueSpec::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_std__vector_Playlist__std__optional_QueueOperation__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_std__string_Playlist_std__optional_QueueOperation__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JHybridTrackPlayerSpec::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_TrackItem_std__optional_Reason__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_TrackPlayerState_std__optional_Reason__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_double_double_cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_double_double_std__optional_bool__cxx::registerNatives();
+  margelo::nitro::nitroplayer::JFunc_void_std__vector_TrackItem__double_cxx::registerNatives();
 
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "PlayerQueue",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridPlayerQueueSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridPlayerQueue");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "TrackPlayer",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridTrackPlayerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridTrackPlayer");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AndroidAutoMediaLibrary",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAndroidAutoMediaLibrarySpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridAndroidAutoMediaLibrary");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AudioDevices",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAudioDevicesSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridAudioDevices");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "DownloadManager",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridDownloadManagerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridDownloadManager");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "Equalizer",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridEqualizerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridEqualizer");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "PlayerQueue",
+    []() -> std::shared_ptr<HybridObject> {
+      static DefaultConstructableObject<JHybridPlayerQueueSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridPlayerQueue");
+      auto instance = object.create();
+      return instance->cthis()->shared();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "TrackPlayer",
+    []() -> std::shared_ptr<HybridObject> {
+      static DefaultConstructableObject<JHybridTrackPlayerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridTrackPlayer");
+      auto instance = object.create();
+      return instance->cthis()->shared();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AndroidAutoMediaLibrary",
+    []() -> std::shared_ptr<HybridObject> {
+      static DefaultConstructableObject<JHybridAndroidAutoMediaLibrarySpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridAndroidAutoMediaLibrary");
+      auto instance = object.create();
+      return instance->cthis()->shared();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AudioDevices",
+    []() -> std::shared_ptr<HybridObject> {
+      static DefaultConstructableObject<JHybridAudioDevicesSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridAudioDevices");
+      auto instance = object.create();
+      return instance->cthis()->shared();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "DownloadManager",
+    []() -> std::shared_ptr<HybridObject> {
+      static DefaultConstructableObject<JHybridDownloadManagerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridDownloadManager");
+      auto instance = object.create();
+      return instance->cthis()->shared();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "Equalizer",
+    []() -> std::shared_ptr<HybridObject> {
+      static DefaultConstructableObject<JHybridEqualizerSpec::javaobject> object("com/margelo/nitro/nitroplayer/HybridEqualizer");
+      auto instance = object.create();
+      return instance->cthis()->shared();
+    }
+  );
 }
 
 } // namespace margelo::nitro::nitroplayer