react-native-audio-browser 0.2.0-next.29 → 0.2.0-next.30

package/ios/AVPlayerEngine.swift

@@ -144,10 +144,6 @@ final class AVPlayerEngine: PlayerEngine {
     mediaLoader.resolveAndLoad(src: src, track: track)
   }
 
-  func loadResolved() {
-    mediaLoader.loadAsset()
-  }
-
   func cancelLoading() {
     mediaLoader.cancelAll()
   }

package/ios/Player/MediaLoader.swift

@@ -43,8 +43,6 @@ final class MediaLoader {
   private(set) var mediaResolverTask: Task<Void, Never>?
   private var metadataLoadTask: Task<Void, Never>?
   private var playableLoadTask: Task<Void, Never>?
-  private var url: URL?
-  private var urlOptions: [String: Any]?
 
   // MARK: - Public API
 
@@ -98,14 +96,8 @@ final class MediaLoader {
     }
   }
 
-  func loadAsset() {
-    guard let url else {
-      // Callers (reload-from-terminal) have already transitioned to .loading;
-      // a silent return would strand that state with no load in flight.
-      onEvent?(.invalidSource("nil"))
-      return
-    }
-    let pendingAsset = AVURLAsset(url: url, options: urlOptions)
+  private func loadAsset(url: URL, options: [String: Any]?) {
+    let pendingAsset = AVURLAsset(url: url, options: options)
     asset = pendingAsset
 
     // Separate from playable loading to allow playback to start faster
@@ -205,8 +197,6 @@ final class MediaLoader {
     playableLoadTask = nil
   }
 
-  /// Preserves `url` and `urlOptions` so that `loadAsset()` can recreate the asset
-  /// (used by `reload()` → `loadAVPlayer()` without a preceding `resolveAndLoad`).
   func clearAsset() {
     guard let currentAsset = asset else { return }
 
@@ -243,12 +233,12 @@ final class MediaLoader {
     }
 
     let isLocalFile = mediaUrl.isFileURL
-    url = isLocalFile ? URL(fileURLWithPath: mediaUrl.path) : mediaUrl
-    urlOptions = Self.buildAssetOptions(headers: resolved.headers, userAgent: resolved.userAgent)
-
     logger.debug("  final playbackUrl: \(mediaUrl.absoluteString)")
     logger.debug("  isLocalFile: \(isLocalFile)")
 
-    loadAsset()
+    loadAsset(
+      url: isLocalFile ? URL(fileURLWithPath: mediaUrl.path) : mediaUrl,
+      options: Self.buildAssetOptions(headers: resolved.headers, userAgent: resolved.userAgent),
+    )
   }
 }

package/ios/Player/Player.swift

@@ -848,18 +848,13 @@ final class Player {
 
   // MARK: - Reloading
 
-  /// Loads the current track again from its resolved URL.
-  func reload(startFromCurrentTime: Bool) {
-    prepareForReload(resumingAt: startFromCurrentTime ? resumePosition : nil)
-    engine.loadResolved()
-  }
-
   /// Loads the current track again, re-running the media-URL resolver, so a consumer whose
-  /// resolver mints short-lived URLs or tokens recovers once they expire. Falls back to
-  /// `reload` when the track has no `src` to resolve.
+  /// resolver mints short-lived URLs or tokens recovers once they expire. A track without a `src`
+  /// fails as an invalid source; with no current track, nothing loads.
   func reloadResolving(startFromCurrentTime: Bool) {
-    guard let track = currentTrack, let src = track.src else {
-      reload(startFromCurrentTime: startFromCurrentTime)
+    guard let track = currentTrack else { return }
+    guard let src = track.src else {
+      transition(.errorOccurred(.invalidSourceUrl("nil")))
       return
     }
     prepareForReload(resumingAt: startFromCurrentTime ? resumePosition : nil)

package/ios/Player/PlayerEngine.swift

@@ -54,8 +54,6 @@ enum EngineEvent {
   /// Runs the media-URL resolver for `track`, so a short-lived URL is minted afresh, and loads
   /// the result.
   func resolveAndLoad(src: String, track: Track)
-  /// Loads the last resolved URL again.
-  func loadResolved()
   func cancelLoading()
   /// Drops the asset and stops observing the item, leaving it in place for the reload.
   func dropAsset()

package/ios/Tests/MediaLoaderTests.swift

@@ -47,21 +47,6 @@ struct MediaLoaderInitialStateTests {
   }
 }
 
-// MARK: - loadAsset
-
-@Suite("loadAsset")
-@MainActor
-struct LoadAssetTests {
-  /// A silent return here stranded the player: reload-from-terminal has
-  /// already transitioned to .loading, so no-oping leaves a spinner forever
-  /// with no load in flight and no error.
-  @Test func withoutResolvedUrl_reportsError() {
-    let (loader, spy) = makeLoader()
-    loader.loadAsset()
-    #expect(spy.playbackErrors.count == 1)
-  }
-}
-
 // MARK: - resolveAndLoad
 
 @Suite("resolveAndLoad")

package/ios/Tests/PlayerPolicyTests.swift

@@ -329,6 +329,21 @@ struct PlayerReviewRegressionTests {
     #expect(player.deferredSeek.target == 30)
   }
 
+  /// Play on a track without a source fails as an invalid source; it never reloads the media
+  /// loader's last URL, which belongs to an earlier track.
+  @Test func playOnATrackWithoutASourceFailsInsteadOfReloading() {
+    let (player, engine, _) = makePlaying()
+    player.setQueue([Track(id: "t2", src: nil, title: "No source")])
+    #expect(player.state == .error)
+    let resolves = engine.resolveAndLoadCalls.count
+
+    player.play()
+
+    #expect(player.state == .error)
+    #expect(player.nitroPlaybackError?.code == TrackPlayerError.PlaybackError.invalidSourceUrl("nil").code)
+    #expect(engine.resolveAndLoadCalls.count == resolves)
+  }
+
   /// While nothing plays, a transition alone rewrites the snapshot.
   @Test func anErrorWhilePausedSavesWhereItStopped() {
     UserDefaults(suiteName: "PlayerTests")!.removePersistentDomain(forName: "PlayerTests")

package/ios/Tests/PlayerTests.swift

@@ -426,13 +426,15 @@ struct PlayWhenReadyTests {
   @Test @MainActor
   func true_fromStopped_triggersReload() {
     let (c, eh, _, _) = makeCoordinator()
+    loadTrack(c)
     c.transition(.stopped)
     eh.resumePosition = 42
+    let resolvesBefore = eh.resolveAndLoadCalls.count
 
     c.setPlayWhenReady(true)
 
     #expect(eh.recreateCount == 0)
-    #expect(eh.loadResolvedCount == 1)
+    #expect(eh.resolveAndLoadCalls.count == resolvesBefore + 1)
     #expect(c.deferredSeek.target == nil) // a stop restarts from the start
   }
 

package/ios/Tests/Support/TestTypes.swift

@@ -50,7 +50,6 @@ final class MockPlayerEngine: PlayerEngine {
 
   // Loading
   var resolveAndLoadCalls: [String] = []
-  var loadResolvedCount = 0
   var cancelLoadingCount = 0
   var dropAssetCount = 0
   var clearItemCount = 0
@@ -58,7 +57,6 @@ final class MockPlayerEngine: PlayerEngine {
   var recreateCount = 0
 
   func resolveAndLoad(src: String, track _: Track) { resolveAndLoadCalls.append(src) }
-  func loadResolved() { loadResolvedCount += 1 }
   func cancelLoading() { cancelLoadingCount += 1 }
   func dropAsset() { dropAssetCount += 1 }
   func clearItem() { clearItemCount += 1 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-browser",
-  "version": "0.2.0-next.29",
+  "version": "0.2.0-next.30",
   "description": "react-native-audio-browser is a react native package built with Nitro",
   "keywords": [
     "react-native",