react-native-nitro-player 1.7.0-alpha.1 → 1.7.0-alpha.3

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

@@ -58,12 +58,16 @@ internal class TrackPlayerEventListener(
             currentTemporaryType = determineCurrentTemporaryType()
 
             // Update currentTrackIndex when landing on an original playlist track
+            val previousTrackIndex = currentTrackIndex
             if (currentTemporaryType == TrackPlayerCore.TemporaryType.NONE && mediaItem != null) {
                 val trackId = extractTrackId(mediaItem.mediaId)
                 val newIdx = currentTracks.indexOfFirst { it.id == trackId }
                 if (newIdx >= 0 && newIdx != currentTrackIndex) currentTrackIndex = newIdx
             }
 
+            val wrappedToStart = currentRepeatMode == RepeatMode.PLAYLIST &&
+                currentTrackIndex == 0 && previousTrackIndex == currentTracks.size - 1
+
             // Top up the windowed timeline — the item we just left freed a slot.
             // Only when it is actually short: rebuildQueueFromCurrentPosition can fall
             // into the substitute-jump path (setMediaItems), which re-enters this very
@@ -77,7 +81,8 @@ internal class TrackPlayerEventListener(
             val track = getCurrentTrack() ?: return
             val r =
                 when (reason) {
-                    Player.MEDIA_ITEM_TRANSITION_REASON_AUTO -> Reason.END
+                    Player.MEDIA_ITEM_TRANSITION_REASON_AUTO ->
+                        if (wrappedToStart) Reason.REPEAT else Reason.END
                     Player.MEDIA_ITEM_TRANSITION_REASON_SEEK -> Reason.USER_ACTION
                     Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED -> Reason.USER_ACTION
                     else -> null

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

@@ -74,6 +74,7 @@ internal fun TrackPlayerCore.skipToPreviousOnQueue() {
 suspend fun TrackPlayerCore.setRepeatMode(mode: RepeatMode) = withPlayerContext { setRepeatModeOnQueue(mode) }
 
 internal fun TrackPlayerCore.setRepeatModeOnQueue(mode: RepeatMode) {
+    val previousMode = currentRepeatMode
     currentRepeatMode = mode
     exo.setRepeatMode(
         when (mode) {
@@ -81,6 +82,11 @@ internal fun TrackPlayerCore.setRepeatModeOnQueue(mode: RepeatMode) {
             else -> Player.REPEAT_MODE_OFF
         },
     )
+    if (!isCastingField && previousMode != mode &&
+        (previousMode == RepeatMode.PLAYLIST || mode == RepeatMode.PLAYLIST)
+    ) {
+        rebuildQueueFromCurrentPosition()
+    }
 }
 
 fun TrackPlayerCore.getRepeatMode(): RepeatMode = currentRepeatMode

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

@@ -7,6 +7,7 @@ import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.Player
 import com.margelo.nitro.nitroplayer.Reason
+import com.margelo.nitro.nitroplayer.RepeatMode
 import com.margelo.nitro.nitroplayer.TrackItem
 
 /**
@@ -121,6 +122,12 @@ internal fun TrackPlayerCore.rebuildQueueFromCurrentPosition() {
     val currentId = exo.currentMediaItem?.mediaId?.let { extractTrackId(it) }
     var newQueueTracks: List<TrackItem> = buildUpcomingQueueTracks(currentId)
 
+    if (!isCastingField && currentRepeatMode == RepeatMode.PLAYLIST &&
+        currentTrackIndex > 0 && currentTrackIndex <= currentTracks.size
+    ) {
+        newQueueTracks = newQueueTracks + currentTracks.subList(0, currentTrackIndex)
+    }
+
     if (isCastingField) {
         newQueueTracks = castableUpcoming(newQueueTracks)
 
@@ -151,9 +158,13 @@ internal fun TrackPlayerCore.rebuildQueueFromCurrentPosition() {
     // ExoPlayer has already prepared, so gapless transitions survive.
     val existingCount = exo.mediaItemCount - currentIndex - 1
     var commonPrefix = 0
-    while (commonPrefix < existingCount && commonPrefix < newQueueTracks.size &&
-        extractTrackId(exo.getMediaItemAt(currentIndex + 1 + commonPrefix).mediaId) == newQueueTracks[commonPrefix].id
-    ) {
+    while (commonPrefix < existingCount && commonPrefix < newQueueTracks.size) {
+        val existing = exo.getMediaItemAt(currentIndex + 1 + commonPrefix)
+        val track = newQueueTracks[commonPrefix]
+        if (extractTrackId(existing.mediaId) != track.id) break
+        // URI must match too — items materialized before lazy URL resolution are unplayable
+        val desiredUrl = if (isCastingField) track.url else downloadManager.getEffectiveUrl(track)
+        if (existing.localConfiguration?.uri?.toString().orEmpty() != desiredUrl) break
         commonPrefix++
     }
 

package/ios/core/TrackPlayerCore.swift

@@ -91,6 +91,7 @@ class TrackPlayerCore: NSObject {
   // track, not a real track change — so it must not emit onChangeTrack or reset
   // per-track state. Consumed (cleared) by the next `currentItemDidChange`.
   internal var suppressTrackChangeEmit = false
+  internal var lastCurrentItemTrackId: String?
   // Last observed playback position, used to resume after recreating a failed item.
   internal var lastKnownPosition: Double = 0
   // Per-track retry budget for recreating AVPlayerItems that hit status == .failed.

package/ios/core/TrackPlayerListener.swift

@@ -173,10 +173,12 @@ extension TrackPlayerCore {
     guard finishedItem.trackId != nil else { return }
 
     // 1. TRACK repeat — handle FIRST, before any temp-track removal
-    if currentRepeatMode == .track, finishedItem === player?.currentItem {
-      NitroPlayerLogger.log("TrackPlayerCore", "🔁 TRACK repeat — seeking to zero and replaying")
-      player?.seek(to: .zero)
-      player?.rate = Float(currentPlaybackSpeed)
+    if currentRepeatMode == .track {
+      if player?.currentItem == nil || player?.currentItem === finishedItem {
+        NitroPlayerLogger.log("TrackPlayerCore", "🔁 TRACK repeat — no queued copy, seeking to zero")
+        player?.seek(to: .zero)
+        player?.rate = Float(currentPlaybackSpeed)
+      }
       return  // do not remove temp tracks, do not notify track change (same track looping)
     }
 
@@ -293,6 +295,7 @@ extension TrackPlayerCore {
     guard let player, let currentItem = player.currentItem else {
       NitroPlayerLogger.log("TrackPlayerCore", "⚠️ Current item changed to nil")
       detachMetadataOutput()
+      lastCurrentItemTrackId = nil
       // Queue exhausted — handle PLAYLIST repeat
       if currentRepeatMode == .playlist && !currentTracks.isEmpty, let player = self.player {
         NitroPlayerLogger.log("TrackPlayerCore", "🔁 PLAYLIST repeat — rebuilding original queue and restarting")
@@ -318,6 +321,11 @@ extension TrackPlayerCore {
       return
     }
 
+    let isRepeatLoop =
+      currentRepeatMode == .track && currentItem.trackId != nil
+      && currentItem.trackId == lastCurrentItemTrackId
+    lastCurrentItemTrackId = currentItem.trackId
+
     #if DEBUG
     NitroPlayerLogger.log("TrackPlayerCore", "\n" + String(repeating: "▶", count: Constants.separatorLineLength))
     NitroPlayerLogger.log("TrackPlayerCore", "🔄 CURRENT ITEM CHANGED")
@@ -367,9 +375,9 @@ extension TrackPlayerCore {
         if currentTemporaryType == .playNext { tempTrack = playNextStack.first(where: { $0.id == trackId }) }
         else if currentTemporaryType == .upNext { tempTrack = upNextQueue.first(where: { $0.id == trackId }) }
         if let track = tempTrack {
-          if isRecoveryReplace {
+          if isRecoveryReplace || isRepeatLoop {
             NitroPlayerLogger.log("TrackPlayerCore",
-              "   ♻️ Recovery replace of temporary track '\(track.title)' — suppressing onChangeTrack")
+              "   ♻️ Same-track transition for '\(track.title)' — suppressing onChangeTrack")
           } else {
             NitroPlayerLogger.log("TrackPlayerCore", "   🎵 Temporary track: \(track.title) - \(track.artist)")
             NitroPlayerLogger.log("TrackPlayerCore", "   📢 Emitting onChangeTrack for temporary track")
@@ -387,7 +395,9 @@ extension TrackPlayerCore {
           NitroPlayerLogger.log("TrackPlayerCore", "   🎵 Track: \(track.title) - \(track.artist)")
           if oldIndex != index {
             NitroPlayerLogger.log("TrackPlayerCore", "   📢 Emitting onChangeTrack (index changed from \(oldIndex) to \(index))")
-            notifyTrackChange(track, .skip)
+            let wrappedToStart =
+              currentRepeatMode == .playlist && index == 0 && oldIndex == currentTracks.count - 1
+            notifyTrackChange(track, wrappedToStart ? .repeat : .skip)
           } else {
             NitroPlayerLogger.log("TrackPlayerCore", "   ⏭️ Skipping onChangeTrack emission (index unchanged)")
           }
@@ -413,7 +423,7 @@ extension TrackPlayerCore {
     // rebuildQueueFromPlaylistIndex (current track no longer in the playlist), which
     // replaces the current item and re-enters this callback. The length check makes any
     // such re-entry a no-op and terminate.
-    if player.items().count - 1 < Constants.queueWindowSize {
+    if currentRepeatMode == .track || player.items().count - 1 < Constants.queueWindowSize {
       rebuildAVQueueFromCurrentPosition()
     }
 

package/ios/core/TrackPlayerPlayback.swift

@@ -72,9 +72,13 @@ extension TrackPlayerCore {
   func skipToPrevious() async { await withPlayerQueueNoThrow { self.skipToPreviousOnQueue() } }
 
   func setRepeatModeOnQueue(mode: RepeatMode) {
+    let previousMode = currentRepeatMode
     currentRepeatMode = mode
-    player?.actionAtItemEnd = (mode == .track) ? .none : .advance
+    player?.actionAtItemEnd = .advance
     if isCasting { castManager?.setQueueRepeatMode(mode) }
+    if !isCasting, previousMode != mode, player?.currentItem != nil {
+      rebuildAVQueueFromCurrentPosition()
+    }
     NitroPlayerLogger.log("TrackPlayerCore", "🔁 setRepeatMode: \(mode)")
   }
   func setRepeatMode(mode: RepeatMode) async {
@@ -254,6 +258,14 @@ extension TrackPlayerCore {
       return
     }
 
+    if currentRepeatMode == .track {
+      let items = queuePlayer.items()
+      if items.count > 1, let copyId = items[1].trackId, copyId == items[0].trackId {
+        queuePlayer.remove(items[1])
+      }
+      rebuildAVQueueFromCurrentPosition(skipRepeatCopy: true)
+    }
+
     // Remove current temp track from its list before advancing
     if let trackId = queuePlayer.currentItem?.trackId {
       if currentTemporaryType == .playNext {

package/ios/core/TrackPlayerQueueBuild.swift

@@ -272,7 +272,9 @@ extension TrackPlayerCore {
   ///
   /// - Parameter changedTrackIds: When non-nil, performs a surgical update:
   ///   only AVPlayerItems whose track ID is in this set are removed and re-created.
-  func rebuildAVQueueFromCurrentPosition(changedTrackIds: Set<String>? = nil) {
+  func rebuildAVQueueFromCurrentPosition(
+    changedTrackIds: Set<String>? = nil, skipRepeatCopy: Bool = false
+  ) {
     // While casting, queue changes are applied to the receiver — the local AVQueuePlayer is dormant.
     if isCasting {
       syncCastQueueAfterCurrent()
@@ -341,6 +343,18 @@ extension TrackPlayerCore {
       newQueueTracks.append(contentsOf: currentTracks[(currentTrackIndex + 1)...])
     }
 
+    if currentRepeatMode == .playlist, currentTrackIndex > 0, currentTrackIndex <= currentTracks.count {
+      newQueueTracks.append(contentsOf: currentTracks[0..<currentTrackIndex])
+    }
+
+    if currentRepeatMode == .track, !skipRepeatCopy {
+      let repeated =
+        playNextStack.first(where: { $0.id == playingTrackId })
+        ?? upNextQueue.first(where: { $0.id == playingTrackId })
+        ?? currentTracks.first(where: { $0.id == playingTrackId })
+      if let repeated = repeated { newQueueTracks = [repeated] }
+    }
+
     // Window the materialized queue — currentItemDidChange tops it up on every transition.
     if newQueueTracks.count > Constants.queueWindowSize {
       newQueueTracks.removeSubrange(Constants.queueWindowSize...)
@@ -530,7 +544,10 @@ extension TrackPlayerCore {
     }
 
     let asset: AVURLAsset
-    if let preloadedAsset = preloadedAssets[track.id] {
+    let preloaded = preloadedAssets[track.id]
+    let preloadedInUse =
+      preloaded != nil && (player?.items().contains { ($0.asset as? AVURLAsset) === preloaded } ?? false)
+    if let preloadedAsset = preloaded, !preloadedInUse {
       asset = preloadedAsset
       NitroPlayerLogger.log("TrackPlayerCore", "🚀 Using preloaded asset for \(track.title)")
     } else {
@@ -571,9 +588,13 @@ extension TrackPlayerCore {
     let queuedTrackIds = Set(player?.items().compactMap { $0.trackId } ?? [])
     let alreadyPreloaded = Set(preloadedAssets.keys)
     let generation = preloadGeneration
-    let endIndex = min(startIndex + Constants.gaplessPreloadCount, currentTracks.count)
-    guard startIndex >= 0, startIndex < endIndex else { return }
-    let candidates = Array(currentTracks[startIndex..<endIndex])
+    let wraps = currentRepeatMode == .playlist && !currentTracks.isEmpty
+    let available =
+      wraps
+      ? min(Constants.gaplessPreloadCount, currentTracks.count)
+      : max(0, min(startIndex + Constants.gaplessPreloadCount, currentTracks.count) - startIndex)
+    guard startIndex >= 0, available > 0 else { return }
+    let candidates = (0..<available).map { currentTracks[(startIndex + $0) % currentTracks.count] }
 
     preloadQueue.async { [weak self] in
       guard let self else { return }
@@ -631,10 +652,20 @@ extension TrackPlayerCore {
   /// Clears preloaded assets that are no longer needed
   func cleanupPreloadedAssets(keepingFrom currentIndex: Int) {
     // Already on playerQueue — access preloadedAssets directly
-    let keepRange =
-      currentIndex..<min(
-        currentIndex + Constants.gaplessPreloadCount + 1, self.currentTracks.count)
-    let keepIds = Set(keepRange.compactMap { self.currentTracks[safe: $0]?.id })
+    let keepIds: Set<String>
+    if currentRepeatMode == .playlist, !self.currentTracks.isEmpty {
+      let start = max(0, currentIndex)
+      let keepCount = min(Constants.gaplessPreloadCount + 1, self.currentTracks.count)
+      keepIds = Set(
+        (0..<keepCount).compactMap {
+          self.currentTracks[safe: (start + $0) % self.currentTracks.count]?.id
+        })
+    } else {
+      let keepRange =
+        currentIndex..<min(
+          currentIndex + Constants.gaplessPreloadCount + 1, self.currentTracks.count)
+      keepIds = Set(keepRange.compactMap { self.currentTracks[safe: $0]?.id })
+    }
 
     let assetsToRemove = self.preloadedAssets.keys.filter { !keepIds.contains($0) }
     for id in assetsToRemove {

package/package.json

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