react-native-nitro-player 0.6.0 → 0.6.1

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

@@ -1201,6 +1201,20 @@ class TrackPlayerCore private constructor(
         val currentIndex = player.currentMediaItemIndex
         if (currentIndex < 0) return
 
+        // Handle removed-current-track case: if the currently playing media item is no longer
+        // in currentTracks (e.g. the user removed it while it was playing), delegate to
+        // playFromIndexInternal so the player immediately starts the next track.
+        val currentTrackId = player.currentMediaItem?.mediaId?.let { extractTrackId(it) }
+        if (currentTrackId != null && currentTracks.none { it.id == currentTrackId }) {
+            val targetIndex = when {
+                currentTracks.isEmpty() -> return
+                currentTrackIndex < currentTracks.size -> currentTrackIndex
+                else -> currentTracks.size - 1
+            }
+            playFromIndexInternal(targetIndex)
+            return
+        }
+
         val newQueueTracks = ArrayList<TrackItem>(playNextStack.size + upNextQueue.size + currentTracks.size)
 
         // Add playNext stack (LIFO - most recently added plays first)
@@ -1609,6 +1623,35 @@ class TrackPlayerCore private constructor(
             if (currentPlaylistId != null && affectedPlaylists.containsKey(currentPlaylistId)) {
                 NitroPlayerLogger.log("TrackPlayerCore") { "🔄 Rebuilding queue - ${affectedPlaylists[currentPlaylistId]} tracks updated in current playlist" }
 
+                // PlaylistManager.updateTracks() creates a new Playlist via .copy(tracks = newTracks),
+                // so our currentTracks reference still points at the old list with empty URLs.
+                // Refresh it now so rebuildQueueFromCurrentPosition builds MediaItems with the
+                // resolved URLs, allowing ExoPlayer to pre-buffer the next track for gapless playback.
+                val refreshedPlaylist = playlistManager.getPlaylist(currentPlaylistId!!)
+                if (refreshedPlaylist != null) {
+                    currentTracks = refreshedPlaylist.tracks
+
+                    // Also reconcile any queued items that still reference old TrackItem instances
+                    // from this playlist, so that gapless pre-buffering uses tracks with resolved URLs.
+                    val updatedTrackById = currentTracks.associateBy { it.id }
+
+                    // Update playNextStack entries to point at the refreshed TrackItem objects.
+                    playNextStack.forEachIndexed { index, track ->
+                        val updated = updatedTrackById[track.id]
+                        if (updated != null && updated !== track) {
+                            playNextStack[index] = updated
+                        }
+                    }
+
+                    // Update upNextQueue entries to point at the refreshed TrackItem objects.
+                    upNextQueue.forEachIndexed { index, track ->
+                        val updated = updatedTrackById[track.id]
+                        if (updated != null && updated !== track) {
+                            upNextQueue[index] = updated
+                        }
+                    }
+                }
+
                 // This method preserves current item and gapless buffering
                 rebuildQueueFromCurrentPosition()
 

package/ios/core/TrackPlayerCore.swift

@@ -1931,6 +1931,21 @@ class TrackPlayerCore: NSObject {
     let currentItem = player.currentItem
     let playingItems = player.items()
 
+    // ---- Handle removed-current-track case ----
+    // If the currently playing AVPlayerItem is no longer in currentTracks (e.g. the user
+    // removed it while it was playing), delegate to rebuildQueueFromPlaylistIndex so the
+    // player immediately starts what is now at currentTrackIndex in the updated list.
+    if let playingTrackId = currentItem?.trackId,
+      !currentTracks.contains(where: { $0.id == playingTrackId }) {
+      let targetIndex = currentTrackIndex < currentTracks.count
+        ? currentTrackIndex
+        : currentTracks.count - 1
+      if targetIndex >= 0 {
+        _ = rebuildQueueFromPlaylistIndex(index: targetIndex)
+      }
+      return
+    }
+
     // ---- Build the desired upcoming track list ----
 
     var newQueueTracks: [TrackItem] = []

package/package.json

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