react-native-audio-browser 0.2.0-next.8 → 0.2.0

package/ios/Tests/CarPlayArtworkResolverTests.swift

@@ -13,7 +13,7 @@ struct SFSymbolTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .sfSymbol(artwork: "sf:heart.fill", width: 40, height: 40))
   }
@@ -25,7 +25,7 @@ struct SFSymbolTests {
       artworkCarPlayTinted: nil,
       targetWidth: 24, targetHeight: 24,
       displayScale: 3.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .sfSymbol(artwork: "sf:play.circle?bg=#000&fg=#fff", width: 24, height: 24))
   }
@@ -41,7 +41,7 @@ struct SFSymbolTests {
       urlResolver: { _, _ in
         resolverCalled = true
         return ArtworkResolvedImage(uri: "https://example.com/img.jpg", headers: nil)
-      },
+      }
     )
     #expect(action == .sfSymbol(artwork: "sf:music.note", width: 40, height: 40))
     #expect(!resolverCalled)
@@ -54,7 +54,7 @@ struct SFSymbolTests {
       artworkCarPlayTinted: nil,
       targetWidth: 20, targetHeight: 20,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .sfSymbol(artwork: "sf:star.fill", width: 20, height: 20))
   }
@@ -71,7 +71,7 @@ struct NoArtworkTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .none)
   }
@@ -83,7 +83,7 @@ struct NoArtworkTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: { _, _ in nil },
+      urlResolver: { _, _ in nil }
     )
     #expect(action == .none)
   }
@@ -105,15 +105,15 @@ struct URLResolutionTests {
         #expect(pixelHeight == 80)
         return ArtworkResolvedImage(
           uri: "https://cdn.example.com/art_80x80.jpg",
-          headers: ["Authorization": "Bearer token"],
+          headers: ["Authorization": "Bearer token"]
         )
-      },
+      }
     )
     #expect(action == .fetch(
       uri: "https://cdn.example.com/art_80x80.jpg",
       headers: ["Authorization": "Bearer token"],
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -126,13 +126,13 @@ struct URLResolutionTests {
       displayScale: 3.0,
       urlResolver: { _, _ in
         ArtworkResolvedImage(uri: "https://cdn.example.com/resized.jpg", headers: nil)
-      },
+      }
     )
     #expect(action == .fetch(
       uri: "https://cdn.example.com/resized.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -143,13 +143,13 @@ struct URLResolutionTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: { _, _ in nil },
+      urlResolver: { _, _ in nil }
     )
     #expect(action == .fetch(
       uri: "https://example.com/art.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -163,14 +163,14 @@ struct URLResolutionTests {
       urlResolver: { _, _ in
         // Return an invalid URI that URL(string:) would reject
         ArtworkResolvedImage(uri: "", headers: nil)
-      },
+      }
     )
     // Should fall back to direct artwork URL
     #expect(action == .fetch(
       uri: "https://example.com/fallback.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -187,7 +187,7 @@ struct URLResolutionTests {
         receivedWidth = w
         receivedHeight = h
         return ArtworkResolvedImage(uri: "https://cdn.example.com/art.jpg", headers: nil)
-      },
+      }
     )
     #expect(receivedWidth == 125) // 50 * 2.5
     #expect(receivedHeight == 75) // 30 * 2.5
@@ -205,13 +205,13 @@ struct DirectFallbackTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/artwork.png",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -222,13 +222,13 @@ struct DirectFallbackTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/source.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -239,13 +239,13 @@ struct DirectFallbackTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/artwork.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -256,7 +256,7 @@ struct DirectFallbackTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .none)
   }
@@ -273,13 +273,13 @@ struct SVGDetectionTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/icon.svg",
       headers: nil,
       shouldTint: false,
-      isSvg: true,
+      isSvg: true
     ))
   }
 
@@ -290,13 +290,13 @@ struct SVGDetectionTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/icon.SVG",
       headers: nil,
       shouldTint: false,
-      isSvg: true,
+      isSvg: true
     ))
   }
 
@@ -309,13 +309,13 @@ struct SVGDetectionTests {
       displayScale: 2.0,
       urlResolver: { _, _ in
         ArtworkResolvedImage(uri: "https://cdn.example.com/icon.svg", headers: nil)
-      },
+      }
     )
     #expect(action == .fetch(
       uri: "https://cdn.example.com/icon.svg",
       headers: nil,
       shouldTint: false,
-      isSvg: true,
+      isSvg: true
     ))
   }
 
@@ -326,13 +326,13 @@ struct SVGDetectionTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/photo.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 }
@@ -348,13 +348,13 @@ struct TintingTests {
       artworkCarPlayTinted: true,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/icon.png",
       headers: nil,
       shouldTint: true,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -365,13 +365,13 @@ struct TintingTests {
       artworkCarPlayTinted: false,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/photo.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -382,13 +382,13 @@ struct TintingTests {
       artworkCarPlayTinted: nil,
       targetWidth: 40, targetHeight: 40,
       displayScale: 2.0,
-      urlResolver: nil,
+      urlResolver: nil
     )
     #expect(action == .fetch(
       uri: "https://example.com/photo.jpg",
       headers: nil,
       shouldTint: false,
-      isSvg: false,
+      isSvg: false
     ))
   }
 
@@ -401,13 +401,13 @@ struct TintingTests {
       displayScale: 2.0,
       urlResolver: { _, _ in
         ArtworkResolvedImage(uri: "https://cdn.example.com/icon.png", headers: nil)
-      },
+      }
     )
     #expect(action == .fetch(
       uri: "https://cdn.example.com/icon.png",
       headers: nil,
       shouldTint: true,
-      isSvg: false,
+      isSvg: false
     ))
   }
 }

package/ios/Tests/ChapterMetadataAVFoundationTests.swift

@@ -10,11 +10,11 @@ import Testing
 private func makeTimedMetadataGroup(
   start: Double,
   duration: Double,
-  title: String? = nil,
+  title: String? = nil
 ) -> AVTimedMetadataGroup {
   let timeRange = CMTimeRange(
     start: CMTime(seconds: start, preferredTimescale: 1000),
-    duration: CMTime(seconds: duration, preferredTimescale: 1000),
+    duration: CMTime(seconds: duration, preferredTimescale: 1000)
   )
 
   var items: [AVMetadataItem] = []

package/ios/Tests/LoadSeekCoordinatorTests.swift

@@ -50,7 +50,7 @@ struct CaptureTests {
   @Test func setsStateToPendingSeek() {
     let c = makeCoordinator()
     c.capture(position: 42.0)
-    guard case let .pendingSeek(time) = c.state else {
+    guard case .pendingSeek(let time) = c.state else {
       Issue.record("expected .pendingSeek, got \(c.state)")
       return
     }
@@ -87,7 +87,7 @@ struct CaptureTests {
       return
     }
     c.capture(position: 30.0)
-    guard case let .pendingSeek(time) = c.state else {
+    guard case .pendingSeek(let time) = c.state else {
       Issue.record("expected .pendingSeek, got \(c.state)")
       return
     }
@@ -118,7 +118,7 @@ struct ExecuteIfPendingTests {
     let player = AVPlayer()
     c.capture(position: 15.0)
     _ = c.executeIfPending(on: player, delegate: nil)
-    guard case let .seekInFlight(time) = c.state else {
+    guard case .seekInFlight(let time) = c.state else {
       Issue.record("expected .seekInFlight, got \(c.state)")
       return
     }
@@ -170,7 +170,7 @@ struct SeekDidCompleteTests {
     c.capture(position: 20.0)
     // Complete the first seek — should re-execute
     #expect(c.seekDidComplete(on: player, delegate: nil) == false)
-    guard case let .seekInFlight(time) = c.state else {
+    guard case .seekInFlight(let time) = c.state else {
       Issue.record("expected .seekInFlight, got \(c.state)")
       return
     }
@@ -220,39 +220,6 @@ struct ResetTests {
       return
     }
   }
-
-  @Test func invalidatesTheGenerationOfSeeksInFlight() {
-    let c = makeCoordinator()
-    let issuedAgainst = c.generation
-    #expect(c.isCurrentGeneration(issuedAgainst))
-    c.reset()
-    #expect(!c.isCurrentGeneration(issuedAgainst))
-  }
-
-  /// The cross-item race: a seek is in flight when a queue change resets the
-  /// coordinator and captures the new track's start position. The old item's
-  /// cancelled completion (now a stale generation) must be dropped — not
-  /// delivered as a completion that would consume the fresh pending seek.
-  @Test func staleCompletionAfterResetIsDroppedAndKeepsThePendingSeek() async {
-    let c = makeCoordinator()
-    let player = AVPlayer()
-    let spy = SeekCompletionSpy()
-
-    c.capture(position: 10.0)
-    _ = c.executeIfPending(on: player, delegate: spy)
-
-    // Queue change: reset, then capture the new track's start position.
-    c.reset()
-    c.capture(position: 25.0)
-
-    // Let the (immediately-cancelled, itemless) seek completion drain.
-    for _ in 0 ..< 20 {
-      await Task.yield()
-    }
-
-    #expect(spy.calls.isEmpty)
-    #expect(c.pendingTime == 25.0)
-  }
 }
 
 // MARK: - Integration
@@ -293,7 +260,7 @@ struct IntegrationTests {
     // First seek
     c.capture(position: 10.0)
     _ = c.executeIfPending(on: player, delegate: nil)
-    guard case let .seekInFlight(t1) = c.state else {
+    guard case .seekInFlight(let t1) = c.state else {
       Issue.record("expected .seekInFlight")
       return
     }
@@ -301,7 +268,7 @@ struct IntegrationTests {
 
     // Override while in-flight
     c.capture(position: 50.0)
-    guard case let .pendingSeek(t2) = c.state else {
+    guard case .pendingSeek(let t2) = c.state else {
       Issue.record("expected .pendingSeek")
       return
     }
@@ -310,7 +277,7 @@ struct IntegrationTests {
     // First seek "completes" — should auto re-execute
     let done = c.seekDidComplete(on: player, delegate: nil)
     #expect(done == false)
-    guard case let .seekInFlight(t3) = c.state else {
+    guard case .seekInFlight(let t3) = c.state else {
       Issue.record("expected .seekInFlight after re-execute")
       return
     }

package/ios/Tests/MediaLoaderTests.swift

@@ -68,21 +68,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")
@@ -92,7 +77,7 @@ struct ResolveAndLoadTests {
     let (loader, spy) = makeLoader()
     loader.resolveAndLoad(src: "")
     #expect(spy.playbackErrors.count == 1)
-    if case let .invalidSourceUrl(url) = spy.playbackErrors.first {
+    if case .invalidSourceUrl(let url) = spy.playbackErrors.first {
       #expect(url == "")
     } else {
       Issue.record("expected .invalidSourceUrl, got \(String(describing: spy.playbackErrors.first))")
@@ -117,30 +102,34 @@ struct ResolveAndLoadTests {
   @Test func withResolver_callsResolver() async {
     let (loader, _) = makeLoader()
     var resolverCalled = false
-    loader.mediaUrlResolver = { src, _ in
+    loader.mediaUrlResolver = { src in
       resolverCalled = true
       return MediaResolvedUrl(url: src, headers: nil, userAgent: nil)
     }
     loader.resolveAndLoad(src: "https://example.com/audio.mp3")
 
-    await loader.mediaResolverTask?.value
+    // Allow the resolver task to run
+    await Task.yield()
 
     #expect(resolverCalled == true)
   }
 
   @Test func withResolver_returningInvalidUrl_callsErrorDelegate() async {
     let (loader, spy) = makeLoader()
-    loader.mediaUrlResolver = { _, _ in
+    loader.mediaUrlResolver = { _ in
       MediaResolvedUrl(url: "", headers: nil, userAgent: nil)
     }
     loader.resolveAndLoad(src: "https://example.com/audio.mp3")
 
-    // The task awaits the resolver then hops back to the main actor, so the
-    // delegate call has landed by the time the task itself completes.
-    await loader.mediaResolverTask?.value
+    // The resolver runs in a Task that awaits the resolver then does MainActor.run,
+    // so we need multiple yields for the full chain to settle.
+    for _ in 0..<10 {
+      await Task.yield()
+      if !spy.playbackErrors.isEmpty { break }
+    }
 
     #expect(spy.playbackErrors.count == 1)
-    if case let .invalidSourceUrl(url) = spy.playbackErrors.first {
+    if case .invalidSourceUrl(let url) = spy.playbackErrors.first {
       #expect(url == "")
     } else {
       Issue.record("expected .invalidSourceUrl")
@@ -150,7 +139,7 @@ struct ResolveAndLoadTests {
   @Test func cancelsPreviousResolverTask() async {
     let (loader, _) = makeLoader()
     var callCount = 0
-    loader.mediaUrlResolver = { src, _ in
+    loader.mediaUrlResolver = { src in
       callCount += 1
       // Simulate slow resolution
       try? await Task.sleep(for: .milliseconds(100))
@@ -162,8 +151,8 @@ struct ResolveAndLoadTests {
     // Immediately start second — should cancel first
     loader.resolveAndLoad(src: "https://example.com/second.mp3")
 
-    // Await the surviving task; the cancelled one bailed before its resolver.
-    await loader.mediaResolverTask?.value
+    // Wait for both to settle
+    try? await Task.sleep(for: .milliseconds(200))
 
     // Only the second resolver should have run (first was cancelled before calling resolver)
     #expect(callCount == 1)
@@ -179,16 +168,15 @@ struct ResolveAndLoadTests {
 struct CancelAllTests {
   @Test func preventsDelegateCallbacksAfterResolveAndLoad() async {
     let (loader, spy) = makeLoader()
-    loader.mediaUrlResolver = { src, _ in
+    loader.mediaUrlResolver = { src in
       try? await Task.sleep(for: .milliseconds(50))
       return MediaResolvedUrl(url: src, headers: nil, userAgent: nil)
     }
     loader.resolveAndLoad(src: "https://example.com/audio.mp3")
-    // cancelAll() drops the handle, so grab it first to await the point where
-    // the callback would have fired.
-    let resolve = loader.mediaResolverTask
     loader.cancelAll()
-    await resolve?.value
+
+    // Wait for what would have been the callback
+    try? await Task.sleep(for: .milliseconds(100))
 
     #expect(spy.preparedItems.isEmpty)
     #expect(spy.playbackErrors.isEmpty)
@@ -226,7 +214,7 @@ struct AsyncLoadingTests {
     loader.resolveAndLoad(src: "file:///nonexistent/path.mp3")
 
     // Poll for delegate callback — asset loading is async
-    for _ in 0 ..< 50 {
+    for _ in 0..<50 {
       if !spy.retryableErrors.isEmpty || !spy.playbackErrors.isEmpty || !spy.preparedItems.isEmpty {
         break
       }