react-native-audio-browser 1.0.0-next.4 → 1.0.0-next.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (239) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +41 -6
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
  5. package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
  6. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  7. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  8. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
  9. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
  10. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  12. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
  15. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
  16. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  17. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  18. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  19. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  20. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  21. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  22. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  23. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  24. package/android/src/main/res/values/strings.xml +5 -2
  25. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  26. package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
  27. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  28. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  30. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  31. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  32. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
  33. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
  34. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  35. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  36. package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
  37. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  38. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
  40. package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
  41. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  42. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
  43. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
  44. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  45. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  46. package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
  47. package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
  49. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  50. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  51. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  52. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  53. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
  54. package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
  55. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  56. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  57. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  58. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  59. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  60. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  61. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  62. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  63. package/ios/AVPlayerEngine.swift +2 -2
  64. package/ios/Browser/BrowserPathHelper.swift +11 -9
  65. package/ios/Browser/PageResolver.swift +1 -1
  66. package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
  67. package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
  68. package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
  69. package/ios/CarPlay/SectionPresentation.swift +7 -0
  70. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  71. package/ios/HybridAudioBrowser+Player.swift +3 -2
  72. package/ios/HybridAudioBrowser.swift +1 -1
  73. package/ios/Model/NitroTypeStubs.swift +15 -0
  74. package/ios/Model/PlayerUpdateOptions.swift +2 -1
  75. package/ios/PlaybackEvent.swift +20 -0
  76. package/ios/Player/Player.swift +17 -3
  77. package/ios/Player/QueueManager.swift +23 -41
  78. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  79. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  80. package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
  81. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  82. package/ios/Tests/GenerationMemoTests.swift +136 -0
  83. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  84. package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
  85. package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
  86. package/ios/Tests/PlayerPolicyTests.swift +51 -28
  87. package/ios/Tests/PlayerProgressTests.swift +0 -2
  88. package/ios/Tests/PlayerTests.swift +54 -0
  89. package/ios/Tests/QueueManagerTests.swift +111 -78
  90. package/ios/Tests/RequestLayerTests.swift +11 -0
  91. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  92. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  93. package/ios/Tests/SectionPresentationTests.swift +13 -0
  94. package/ios/Tests/Support/TestTypes.swift +23 -1
  95. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  96. package/ios/Util/AwaitCallback.swift +16 -10
  97. package/ios/Util/GenerationMemo.swift +81 -17
  98. package/ios/Util/JSCallbackError.swift +23 -0
  99. package/ios/Util/OutputPicker.swift +25 -5
  100. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  101. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  102. package/lib/commonjs/features/browser-config.js +3 -2
  103. package/lib/commonjs/features/browser-config.js.map +1 -1
  104. package/lib/commonjs/features/browser.js +7 -8
  105. package/lib/commonjs/features/browser.js.map +1 -1
  106. package/lib/commonjs/features/output.js +7 -3
  107. package/lib/commonjs/features/output.js.map +1 -1
  108. package/lib/commonjs/features/player/options.js.map +1 -1
  109. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  110. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  111. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  112. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  114. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  115. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  116. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  117. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  118. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  119. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  120. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  121. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  122. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  123. package/lib/module/features/browser-config.js +3 -2
  124. package/lib/module/features/browser-config.js.map +1 -1
  125. package/lib/module/features/browser.js +7 -8
  126. package/lib/module/features/browser.js.map +1 -1
  127. package/lib/module/features/output.js +7 -3
  128. package/lib/module/features/output.js.map +1 -1
  129. package/lib/module/features/player/options.js.map +1 -1
  130. package/lib/module/web/NativeAudioBrowser.js +43 -2
  131. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  132. package/lib/module/web/browser/BrowserManager.js +37 -66
  133. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  134. package/lib/module/web/browser/SearchManager.js +1 -5
  135. package/lib/module/web/browser/SearchManager.js.map +1 -1
  136. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  137. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  138. package/lib/module/web/player/NowPlayingManager.js +3 -22
  139. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  140. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  141. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  142. package/lib/module/web/util/GenerationMemo.js +87 -0
  143. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  144. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  145. package/lib/typescript/src/features/browser.d.ts +7 -8
  146. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  147. package/lib/typescript/src/features/output.d.ts +8 -4
  148. package/lib/typescript/src/features/output.d.ts.map +1 -1
  149. package/lib/typescript/src/features/player/options.d.ts +19 -1
  150. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  151. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  152. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  153. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  154. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  155. package/lib/typescript/src/types/browser.d.ts +55 -8
  156. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  157. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  158. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  159. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  160. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  161. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  162. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  163. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  164. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  165. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  166. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  167. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  168. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
  169. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  170. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  171. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  172. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  173. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  174. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  175. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
  176. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  177. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  178. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  179. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  180. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  181. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  182. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  183. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
  184. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  185. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  186. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  187. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
  188. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  189. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  190. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  191. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
  192. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  193. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  194. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  195. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  196. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  197. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  198. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  199. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  200. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  201. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  202. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  203. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  204. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
  205. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  206. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  207. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  208. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  209. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
  210. package/package.json +1 -1
  211. package/src/codegen-js-error-message.test.ts +78 -0
  212. package/src/features/browser-config.test.ts +7 -0
  213. package/src/features/browser-config.ts +3 -2
  214. package/src/features/browser.ts +7 -8
  215. package/src/features/output.ts +13 -5
  216. package/src/features/player/options.ts +19 -1
  217. package/src/specs/audio-browser.nitro.ts +16 -3
  218. package/src/types/browser-native.ts +4 -1
  219. package/src/types/browser.ts +60 -8
  220. package/src/web/NativeAudioBrowser.ts +43 -3
  221. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  222. package/src/web/browser/BrowserManager.ts +50 -79
  223. package/src/web/browser/SearchManager.ts +1 -8
  224. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  225. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  226. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  227. package/src/web/http/RequestConfigBuilder.ts +72 -57
  228. package/src/web/player/NowPlayingManager.test.ts +29 -0
  229. package/src/web/player/NowPlayingManager.ts +4 -27
  230. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  231. package/src/web/util/BrowserPathHelper.ts +6 -7
  232. package/src/web/util/GenerationMemo.test.ts +148 -0
  233. package/src/web/util/GenerationMemo.ts +103 -0
  234. package/website/guide/audio-output.md +34 -7
  235. package/website/guide/browser.md +21 -0
  236. package/website/guide/carplay.md +1 -1
  237. package/website/guide/configuration.md +10 -9
  238. package/website/guide/gate.md +1 -1
  239. package/website/guide/remote-controls.md +35 -0
@@ -119,8 +119,8 @@ final class Player {
119
119
  !awaitingItem && load?.itemPrepared == true
120
120
  }
121
121
 
122
- /// Whether the engine's item is one of this Load's, which a reload of the track keeps until the
123
- /// next is prepared.
122
+ /// Whether the engine's item is one of this Load's, which a reload of an on-demand track keeps
123
+ /// until the next is prepared; a live track's gives way to the now-playing carrier.
124
124
  private var engineItemIsCurrent: Bool {
125
125
  load?.itemPrepared == true
126
126
  }
@@ -157,6 +157,7 @@ final class Player {
157
157
  // MARK: - TrackSelectionPlayer and NowPlayingSource
158
158
 
159
159
  var tracks: [Track] { queue.tracks }
160
+ var upNextIndices: [Int] { queue.upNextIndices }
160
161
  var queueVersion: Int { queue.version }
161
162
  var queueSourcePath: String? { queue.queueSourcePath }
162
163
  var currentTrack: Track? { queue.currentTrack }
@@ -317,6 +318,9 @@ final class Player {
317
318
  return
318
319
  }
319
320
  state = newState
321
+ logger.debug(
322
+ "\(oldState.stringValue, privacy: .public) → \(newState.stringValue, privacy: .public) on \(event.logDescription, privacy: .public)",
323
+ )
320
324
  applySideEffects(old: oldState, new: newState)
321
325
  publish()
322
326
  saveSnapshotWhileNothingPlays()
@@ -438,6 +442,8 @@ final class Player {
438
442
  // A stop during a deferred park leaves the previous track's item in the engine: closed too.
439
443
  if holdsLiveConnection || pendingIdleLivePark != nil {
440
444
  cancelIdleLivePark()
445
+ // Paused first: a playing AVPlayer can report the carrier as playing after the stop.
446
+ engine.pause()
441
447
  closeLiveConnection()
442
448
  }
443
449
  // Before the transition, whose render the formatter reads the intent from.
@@ -607,7 +613,11 @@ final class Player {
607
613
 
608
614
  func skipTo(_ index: Int, playWhenReady: Bool? = nil) throws {
609
615
  try handlePlayWhenReady(playWhenReady) {
610
- if index == queue.currentIndex {
616
+ if index == queue.currentIndex, state == .error {
617
+ // A skip starts the track over: not where it failed, nor at a seek made since.
618
+ deferredSeek.reset()
619
+ reloadResolving(startFromCurrentTime: false)
620
+ } else if index == queue.currentIndex {
611
621
  seek(to: 0)
612
622
  } else {
613
623
  try queue.skipTo(index)
@@ -921,6 +931,8 @@ final class Player {
921
931
  engine.cancelLoading()
922
932
  engine.stopObservingItem()
923
933
  engine.pause()
934
+ // Without a loaded asset the item is already the carrier: a parked stream's.
935
+ if currentTrack?.live == true, engine.hasLoadedAsset { engine.replaceItemWithNowPlayingCarrier() }
924
936
  }
925
937
  if let target { deferredSeek.capture(target) }
926
938
  transition(.trackLoading)
@@ -1028,6 +1040,8 @@ final class Player {
1028
1040
  /// stalls instead, which is the stall watch's. A live stream's is a dropped connection, a
1029
1041
  /// failure for the retry loop, since AVPlayer will not play on from an item it has ended.
1030
1042
  private func itemDidPlayToEnd() {
1043
+ // stop() keeps an on-demand item under observation: its end can land after the stop.
1044
+ guard state != .stopped else { return }
1031
1045
  guard currentTrack?.live == true else { return trackDidPlayToEnd() }
1032
1046
  // The engine stops observing the item it replaces: an end delivered during the load is stale.
1033
1047
  guard state != .loading else { return }
@@ -65,42 +65,6 @@ class QueueManager {
65
65
  return tracks[currentIndex]
66
66
  }
67
67
 
68
- /// In playback order, so shuffled when shuffle is on; no wrap.
69
- var nextTracks: [Track] {
70
- guard currentIndex >= 0, currentIndex < tracks.count else { return [] }
71
-
72
- if shuffleEnabled {
73
- var result: [Track] = []
74
- var index = currentIndex
75
- while let nextIndex = shuffleOrder.getNextIndex(after: index) {
76
- result.append(tracks[nextIndex])
77
- index = nextIndex
78
- }
79
- return result
80
- }
81
-
82
- guard currentIndex < tracks.count - 1 else { return [] }
83
- return Array(tracks[currentIndex + 1 ..< tracks.count])
84
- }
85
-
86
- /// In playback order, so shuffled when shuffle is on; no wrap.
87
- var previousTracks: [Track] {
88
- guard currentIndex >= 0, currentIndex < tracks.count else { return [] }
89
-
90
- if shuffleEnabled {
91
- var result: [Track] = []
92
- var index = currentIndex
93
- while let prevIndex = shuffleOrder.getPreviousIndex(before: index) {
94
- result.insert(tracks[prevIndex], at: 0)
95
- index = prevIndex
96
- }
97
- return result
98
- }
99
-
100
- guard currentIndex > 0 else { return [] }
101
- return Array(tracks[0 ..< currentIndex])
102
- }
103
-
104
68
  var isLastInPlaybackOrder: Bool {
105
69
  if shuffleEnabled {
106
70
  return shuffleOrder.isLast(currentIndex)
@@ -141,19 +105,37 @@ class QueueManager {
141
105
  // Shared by `next()` and `canNext` so the button and the navigation agree. Wraps only on
142
106
  // repeat-queue, shuffled or not, as Media3 does.
143
107
  private var nextIndex: Int? {
144
- guard currentTrack != nil, tracks.count > 1 else { return nil }
108
+ guard currentTrack != nil else { return nil }
109
+ return nextIndex(after: currentIndex)
110
+ }
111
+
112
+ private func nextIndex(after index: Int) -> Int? {
113
+ guard tracks.count > 1 else { return nil }
145
114
  let candidate: Int? = if shuffleEnabled {
146
- shuffleOrder.getNextIndex(after: currentIndex)
115
+ shuffleOrder.getNextIndex(after: index)
147
116
  ?? (repeatMode == .queue ? shuffleOrder.firstIndex : nil)
148
- } else if currentIndex + 1 < tracks.count {
149
- currentIndex + 1
117
+ } else if index + 1 < tracks.count {
118
+ index + 1
150
119
  } else {
151
120
  repeatMode == .queue ? 0 : nil
152
121
  }
153
- guard let candidate, candidate != currentIndex else { return nil }
122
+ guard let candidate, candidate != index else { return nil }
154
123
  return candidate
155
124
  }
156
125
 
126
+ /// The indices `next()` goes through from the current track, until it would stop or come back
127
+ /// to it: shuffled when shuffle is on, wrapped where `next()` wraps.
128
+ var upNextIndices: [Int] {
129
+ guard currentTrack != nil else { return [] }
130
+ var indices: [Int] = []
131
+ var index = currentIndex
132
+ while indices.count < tracks.count - 1, let next = nextIndex(after: index), next != currentIndex {
133
+ indices.append(next)
134
+ index = next
135
+ }
136
+ return indices
137
+ }
138
+
157
139
  private var previousIndex: Int? {
158
140
  guard currentTrack != nil, tracks.count > 1 else { return nil }
159
141
  let candidate: Int? = if shuffleEnabled {
@@ -49,6 +49,14 @@ struct AwaitCallbackTests {
49
49
  #expect(result == 7)
50
50
  }
51
51
 
52
+ @MainActor
53
+ @Test func subscribeRunsOnTheCallersActor() async throws {
54
+ let onMainThread = try await awaitCallback { deliver in
55
+ deliver(.success(Thread.isMainThread))
56
+ }
57
+ #expect(onMainThread)
58
+ }
59
+
52
60
  @Test func aRejectionThrowsIt() async throws {
53
61
  let callback = FakeCallback()
54
62
  await #expect(throws: Rejected.self) {
@@ -35,6 +35,24 @@ import Testing
35
35
  #expect(result == "http://example.com/api/search")
36
36
  }
37
37
 
38
+ @Test func buildUrlKeepsPathWithColonAfterFirstSlashRelative() {
39
+ #expect(BrowserPathHelper.buildUrl(baseUrl: "https://api.example.com", path: "/shows/a:b")
40
+ == "https://api.example.com/shows/a:b")
41
+ #expect(BrowserPathHelper.buildUrl(baseUrl: "https://api.example.com", path: "shows/a:b")
42
+ == "https://api.example.com/shows/a:b")
43
+ }
44
+
45
+ @Test(arguments: [
46
+ "HTTPS://other.example.com/a.mp3",
47
+ "file:///var/mobile/Containers/Data/Application/x/Documents/a.mp3",
48
+ "data:image/png;base64,iVBORw0KGgo=",
49
+ "blob:https://app.example.com/0b1c2d3e",
50
+ "//cdn.example.com/a.mp3",
51
+ ])
52
+ func buildUrlReturnsUrlWithSchemeWithoutBase(url: String) {
53
+ #expect(BrowserPathHelper.buildUrl(baseUrl: "https://api.example.com", path: url) == url)
54
+ }
55
+
38
56
  // MARK: - appendQuery
39
57
 
40
58
  @Test func appendQueryAddsParamsWithQuestionMark() {
@@ -29,6 +29,10 @@ struct CapabilityRemoteCommandTests {
29
29
  }
30
30
  }
31
31
 
32
+ @Test func skipToQueueItemEnablesNoCommand() {
33
+ #expect(PlayerCapabilities(skipToQueueItem: false).remoteCommands == Set(RemoteCommand.allCases))
34
+ }
35
+
32
36
  @Test func favoriteEnablesNoCommand() {
33
37
  #expect(PlayerCapabilities(favorite: false).remoteCommands == Set(RemoteCommand.allCases))
34
38
  }
@@ -0,0 +1,25 @@
1
+ import Foundation
2
+ import Testing
3
+
4
+ /// What ArtworkImageFetcher's data: URL provider relies on: Foundation decodes an RFC 2397 URL.
5
+ @Suite("data: URL decoding")
6
+ struct DataURLDecodingTests {
7
+ private static let png1x1 =
8
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg=="
9
+
10
+ private func decoded(_ uri: String) throws -> Data {
11
+ try Data(contentsOf: #require(URL(string: uri)))
12
+ }
13
+
14
+ @Test func aBase64PayloadAfterMediaTypeParametersDecodesToItsBytes() throws {
15
+ #expect(try decoded("data:image/png;name=a.png;base64,\(Self.png1x1)") == Data(base64Encoded: Self.png1x1))
16
+ }
17
+
18
+ @Test func aPlainPayloadIsPercentDecoded() throws {
19
+ #expect(try decoded("data:image/svg+xml,%3Csvg%20xmlns%3D%22a%22%2F%3E") == Data(#"<svg xmlns="a"/>"#.utf8))
20
+ }
21
+
22
+ @Test func anInvalidBase64PayloadThrows() {
23
+ #expect(throws: (any Error).self) { try decoded("data:image/png;base64,not*base64") }
24
+ }
25
+ }
@@ -175,4 +175,140 @@ struct GenerationMemoTests {
175
175
  gate.release()
176
176
  #expect(try await withinTimeLimit { try await later.value } == 7)
177
177
  }
178
+
179
+ /// Runs that each suspend until released on their own, numbered from 0 in start order.
180
+ @MainActor
181
+ final class Runs {
182
+ private var waiters: [CheckedContinuation<Result<Int, Error>, Never>?] = []
183
+ var count: Int { waiters.count }
184
+
185
+ func run() async throws -> Int {
186
+ try await withCheckedContinuation { waiters.append($0) }.get()
187
+ }
188
+
189
+ func release(_ index: Int, _ result: Result<Int, Error>) {
190
+ guard waiters.indices.contains(index) else {
191
+ Issue.record("no run \(index)")
192
+ return
193
+ }
194
+ waiters[index]?.resume(returning: result)
195
+ waiters[index] = nil
196
+ }
197
+
198
+ func waitForRuns(_ count: Int, sourceLocation: SourceLocation = #_sourceLocation) async {
199
+ for _ in 0 ..< 1000 where self.count < count {
200
+ await Task.yield()
201
+ }
202
+ if self.count < count {
203
+ Issue.record("expected \(count) runs, saw \(self.count)", sourceLocation: sourceLocation)
204
+ }
205
+ }
206
+ }
207
+
208
+ @MainActor
209
+ final class TestClock {
210
+ var now = ContinuousClock.now
211
+ }
212
+
213
+ @Test func aCallerPastTheBoundStartsAnotherRunWhoseValueReleasesEveryCaller() async throws {
214
+ let clock = TestClock()
215
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
216
+ let runs = Runs()
217
+ let early = Task { try await memo.value { try await runs.run() } }
218
+ await runs.waitForRuns(1)
219
+ clock.now += .seconds(11)
220
+ let late = Task { try await memo.value { try await runs.run() } }
221
+ await runs.waitForRuns(2)
222
+ runs.release(1, .success(2))
223
+ #expect(try await withinTimeLimit { try await late.value } == 2)
224
+ #expect(try await withinTimeLimit { try await early.value } == 2)
225
+ runs.release(0, .success(1))
226
+ }
227
+
228
+ @Test func aCallerWithinTheBoundJoinsTheRun() async throws {
229
+ let clock = TestClock()
230
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
231
+ let runs = Runs()
232
+ let early = Task { try await memo.value { try await runs.run() } }
233
+ await runs.waitForRuns(1)
234
+ clock.now += .seconds(9)
235
+ let late = Task { try await memo.value { try await runs.run() } }
236
+ for _ in 0 ..< 100 {
237
+ await Task.yield()
238
+ }
239
+ #expect(runs.count == 1)
240
+ runs.release(0, .success(1))
241
+ #expect(try await withinTimeLimit { try await late.value } == 1)
242
+ #expect(try await withinTimeLimit { try await early.value } == 1)
243
+ }
244
+
245
+ @Test func theBoundCountsFromTheNewestRun() async throws {
246
+ let clock = TestClock()
247
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
248
+ let runs = Runs()
249
+ let first = Task { try await memo.value { try await runs.run() } }
250
+ await runs.waitForRuns(1)
251
+ clock.now += .seconds(11)
252
+ let second = Task { try await memo.value { try await runs.run() } }
253
+ await runs.waitForRuns(2)
254
+ clock.now += .seconds(5)
255
+ let third = Task { try await memo.value { try await runs.run() } }
256
+ for _ in 0 ..< 100 {
257
+ await Task.yield()
258
+ }
259
+ #expect(runs.count == 2)
260
+ runs.release(1, .success(2))
261
+ #expect(try await withinTimeLimit { try await third.value } == 2)
262
+ #expect(try await withinTimeLimit { try await first.value } == 2)
263
+ _ = try await second.value
264
+ runs.release(0, .success(1))
265
+ }
266
+
267
+ @Test func theFirstValueOfAGenerationIsKeptOverALaterRunsValue() async throws {
268
+ let clock = TestClock()
269
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
270
+ let runs = Runs()
271
+ let early = Task { try await memo.value { try await runs.run() } }
272
+ await runs.waitForRuns(1)
273
+ clock.now += .seconds(11)
274
+ let late = Task { try await memo.value { try await runs.run() } }
275
+ await runs.waitForRuns(2)
276
+ runs.release(1, .success(2))
277
+ _ = try await withinTimeLimit { try await late.value }
278
+ _ = try await withinTimeLimit { try await early.value }
279
+ runs.release(0, .success(1))
280
+ for _ in 0 ..< 100 {
281
+ await Task.yield()
282
+ }
283
+ #expect(try await memo.value { 3 } == 2)
284
+ }
285
+
286
+ @Test func aLaterRunsFailureLeavesTheEarlierRunsCallersWaiting() async throws {
287
+ let clock = TestClock()
288
+ let memo = GenerationMemo<Int>(shareFor: .seconds(10), now: { clock.now })
289
+ let runs = Runs()
290
+ let early = Task { try await memo.value { try await runs.run() } }
291
+ await runs.waitForRuns(1)
292
+ clock.now += .seconds(11)
293
+ let late = Task { try await memo.value { try await runs.run() } }
294
+ await runs.waitForRuns(2)
295
+ runs.release(1, .failure(Failure()))
296
+ await #expect(throws: Failure.self) { try await withinTimeLimit { try await late.value } }
297
+ runs.release(0, .success(1))
298
+ #expect(try await withinTimeLimit { try await early.value } == 1)
299
+ }
300
+
301
+ @Test func aNewGenerationsValueReleasesTheCallersOfAnEarlierSilentRun() async throws {
302
+ let memo = GenerationMemo<Int>()
303
+ let runs = Runs()
304
+ let early = Task { try await memo.value { try await runs.run() } }
305
+ await runs.waitForRuns(1)
306
+ memo.invalidate()
307
+ let late = Task { try await memo.value { try await runs.run() } }
308
+ await runs.waitForRuns(2)
309
+ runs.release(1, .success(2))
310
+ #expect(try await withinTimeLimit { try await late.value } == 2)
311
+ #expect(try await withinTimeLimit { try await early.value } == 2)
312
+ runs.release(0, .success(1))
313
+ }
178
314
  }
@@ -0,0 +1,33 @@
1
+ import Testing
2
+
3
+ @testable import AudioBrowserTestable
4
+
5
+ @Suite("JSCallbackError")
6
+ struct JSCallbackErrorTests {
7
+ /// Nitro's `RuntimeError` before 0.37.2: an `Error` whose message is only its `description`.
8
+ struct NitroRuntimeError: Error, CustomStringConvertible {
9
+ let description: String
10
+ }
11
+
12
+ @Test func givesARejectionsMessageAsItsLocalizedDescription() {
13
+ let error = JSCallbackError(NitroRuntimeError(description: "token expired"))
14
+ #expect(error.localizedDescription == "token expired")
15
+ }
16
+
17
+ @Test func keepsASyncThrowsMessageWhole() {
18
+ let error = JSCallbackError(NitroRuntimeError(description: "Error: token expired"))
19
+ #expect(error.localizedDescription == "Error: token expired")
20
+ }
21
+
22
+ @Test func leavesOutAJSPromiseRejectionsErrorName() {
23
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "Error: token expired")).message == "token expired")
24
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "TypeError: bad header")).message == "bad header")
25
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "Error: upstream: 503")).message == "upstream: 503")
26
+ }
27
+
28
+ @Test func keepsAJSPromiseRejectionsNameThatIsNotAnErrorName() {
29
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "Timeout: took 30s")).message == "Timeout: took 30s")
30
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "ErrorCode: 7")).message == "ErrorCode: 7")
31
+ #expect(JSCallbackError(jsPromiseRejection: NitroRuntimeError(description: "token expired")).message == "token expired")
32
+ }
33
+ }
@@ -40,4 +40,39 @@ struct NowPlayingButtonRulesTests {
40
40
  @Test func rate_noRates_isNil() {
41
41
  #expect(NowPlayingButtonRules.rate(after: 1, in: []) == nil)
42
42
  }
43
+
44
+ @Test func queueItemPick_isAllowedUnlessTheCapabilityIsFalse() {
45
+ #expect(NowPlayingButtonRules.queueItemPickAllowed(nil))
46
+ #expect(NowPlayingButtonRules.queueItemPickAllowed(true))
47
+ #expect(!NowPlayingButtonRules.queueItemPickAllowed(false))
48
+ }
49
+
50
+ @Test func queueItemPick_skipsOnTheQueueTheRowWasBuiltFor() {
51
+ #expect(NowPlayingButtonRules.queueItemPick(skipToQueueItem: nil, rowQueueVersion: 7, queueVersion: 7) == .skip)
52
+ #expect(NowPlayingButtonRules.queueItemPick(skipToQueueItem: true, rowQueueVersion: 7, queueVersion: 7) == .skip)
53
+ }
54
+
55
+ @Test func queueItemPick_afterAQueueChange_rebuildsInsteadOfSkipping() {
56
+ #expect(NowPlayingButtonRules.queueItemPick(skipToQueueItem: nil, rowQueueVersion: 7, queueVersion: 8) == .rebuild)
57
+ }
58
+
59
+ @Test func queueItemPick_refusedWithTheCapabilityOffOrNoPlayer() {
60
+ #expect(NowPlayingButtonRules.queueItemPick(skipToQueueItem: false, rowQueueVersion: 7, queueVersion: 7) == .refuse)
61
+ #expect(NowPlayingButtonRules.queueItemPick(skipToQueueItem: false, rowQueueVersion: 7, queueVersion: 8) == .refuse)
62
+ #expect(NowPlayingButtonRules.queueItemPick(skipToQueueItem: nil, rowQueueVersion: 7, queueVersion: nil) == .refuse)
63
+ }
64
+
65
+ @Test func upNext_needsATrackAfterTheCurrentOne_withTheCapabilityUnsetOrOn() {
66
+ #expect(NowPlayingButtonRules.upNextEnabled(option: true, skipToQueueItem: nil, upNextCount: 1))
67
+ #expect(NowPlayingButtonRules.upNextEnabled(option: true, skipToQueueItem: true, upNextCount: 1))
68
+ #expect(!NowPlayingButtonRules.upNextEnabled(option: true, skipToQueueItem: nil, upNextCount: 0))
69
+ }
70
+
71
+ @Test func upNext_isOffWithoutTheOption() {
72
+ #expect(!NowPlayingButtonRules.upNextEnabled(option: false, skipToQueueItem: true, upNextCount: 1))
73
+ }
74
+
75
+ @Test func upNext_isOffWithoutTheCapability_whateverTheOption() {
76
+ #expect(!NowPlayingButtonRules.upNextEnabled(option: true, skipToQueueItem: false, upNextCount: 1))
77
+ }
43
78
  }
@@ -161,3 +161,18 @@ struct BufferingSufficientTests {
161
161
  }
162
162
  }
163
163
  }
164
+
165
+ // MARK: - logDescription
166
+
167
+ @Suite("PlaybackEvent.logDescription — public, so free of URLs")
168
+ struct PlaybackEventLogDescriptionTests {
169
+ @Test func namesTheCaseAndItsFlag() {
170
+ #expect(PlaybackEvent.avPlayerWaiting.logDescription == "avPlayerWaiting")
171
+ #expect(PlaybackEvent.avPlayerPaused(hasAsset: true).logDescription == "avPlayerPaused(hasAsset: true)")
172
+ }
173
+
174
+ @Test func aFailureOmitsItsURL() {
175
+ let event = PlaybackEvent.errorOccurred(.invalidSourceUrl("https://example.com/secret?token=1"))
176
+ #expect(event.logDescription == "errorOccurred")
177
+ }
178
+ }
@@ -23,8 +23,6 @@ private func makePlaying(
23
23
  ) throws -> (Player, MockPlayerEngine, MockPlayerCallbacks) {
24
24
  let (player, engine, callbacks) = try makeLoading(live: live, scheduler: scheduler)
25
25
  player.setPlayWhenReady(true)
26
- engine.hasItem = true
27
- engine.hasLoadedAsset = true
28
26
  engine.emit(.itemPrepared(likelyToKeepUp: true))
29
27
  player.transition(.avPlayerPlaying)
30
28
  return (player, engine, callbacks)
@@ -40,8 +38,6 @@ private func makeStalling(givesUp: Bool = false) throws -> (Player, MockPlayerEn
40
38
  let callbacks = MockPlayerCallbacks()
41
39
  player.callbacks = callbacks
42
40
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], playWhenReady: true)
43
- engine.hasItem = true
44
- engine.hasLoadedAsset = true
45
41
  engine.emit(.itemPrepared(likelyToKeepUp: true))
46
42
  player.transition(.avPlayerPlaying)
47
43
  engine.emit(.stalled)
@@ -60,8 +56,6 @@ private func makeVirtual(online: Bool = true) throws -> (Player, MockPlayerEngin
60
56
  let callbacks = MockPlayerCallbacks()
61
57
  player.callbacks = callbacks
62
58
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T", live: true)], playWhenReady: true)
63
- engine.hasItem = true
64
- engine.hasLoadedAsset = true
65
59
  engine.emit(.itemPrepared(likelyToKeepUp: true))
66
60
  return (player, engine, callbacks, clock)
67
61
  }
@@ -93,8 +87,6 @@ struct PlayerSeekingTests {
93
87
  player.seek(to: 30)
94
88
  #expect(engine.seekCalls.isEmpty)
95
89
 
96
- engine.hasItem = true
97
- engine.hasLoadedAsset = true
98
90
  engine.emit(.itemPrepared(likelyToKeepUp: true))
99
91
  #expect(engine.seekCalls == [30])
100
92
  #expect(player.state == .loading)
@@ -103,8 +95,6 @@ struct PlayerSeekingTests {
103
95
  @Test func theLoadBecomesReadyWhenTheDeferredSeekLands() throws {
104
96
  let (player, engine, _) = try makeLoading()
105
97
  player.seek(to: 30)
106
- engine.hasItem = true
107
- engine.hasLoadedAsset = true
108
98
  engine.emit(.itemPrepared(likelyToKeepUp: false))
109
99
  #expect(engine.seekCalls == [30])
110
100
  #expect(player.state == .ready)
@@ -137,7 +127,6 @@ struct PlayerSeekingTests {
137
127
  let player = makePlayer(engine: engine)
138
128
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
139
129
  engine.seekResult = nil
140
- engine.hasItem = true
141
130
  engine.emit(.itemPrepared(likelyToKeepUp: true))
142
131
 
143
132
  player.reloadResolving(startFromCurrentTime: true)
@@ -156,7 +145,6 @@ struct PlayerSeekingTests {
156
145
  let player = makePlayer(engine: engine)
157
146
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
158
147
  engine.seekResult = nil
159
- engine.hasItem = true
160
148
  engine.emit(.itemPrepared(likelyToKeepUp: true))
161
149
 
162
150
  engine.completeSeeks(false)
@@ -172,7 +160,6 @@ struct PlayerSeekingTests {
172
160
  let player = makePlayer(engine: engine)
173
161
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
174
162
  engine.seekResult = nil
175
- engine.hasItem = true
176
163
  engine.emit(.itemPrepared(likelyToKeepUp: true))
177
164
 
178
165
  player.reloadResolving(startFromCurrentTime: false)
@@ -189,7 +176,6 @@ struct PlayerSeekingTests {
189
176
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
190
177
 
191
178
  player.mediaServicesWereReset()
192
- engine.hasItem = true
193
179
  engine.emit(.itemPrepared(likelyToKeepUp: true))
194
180
 
195
181
  #expect(engine.seekCalls == [25])
@@ -200,7 +186,6 @@ struct PlayerSeekingTests {
200
186
  let player = makePlayer(engine: engine)
201
187
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
202
188
  engine.seekResult = nil
203
- engine.hasItem = true
204
189
  engine.emit(.itemPrepared(likelyToKeepUp: true))
205
190
 
206
191
  player.stop()
@@ -294,8 +279,6 @@ struct PlayerEngineEventTests {
294
279
  @Test func aPauseWhileLoadingReachesTheEngine_aPlayDoesNot() throws {
295
280
  let (player, engine, _) = try makeLoading()
296
281
  player.setPlayWhenReady(true)
297
- engine.hasItem = true
298
- engine.hasLoadedAsset = true
299
282
  engine.emit(.itemPrepared(likelyToKeepUp: false))
300
283
  #expect(player.state == .loading)
301
284
  let plays = engine.startPlaybackCallCount
@@ -353,6 +336,25 @@ struct PlayerEngineEventTests {
353
336
  #expect(engine.shortStartBufferRequests == [false, true, false])
354
337
  }
355
338
 
339
+ /// #299: with the ended item still in the AVPlayer, the next item reads a progressive stream's
340
+ /// new connection over two GETs at once. The carrier keeps the now-playing surface meanwhile.
341
+ @Test func aLiveEndsReconnectLoadsWithTheCarrierInTheEndedItemsPlace() async throws {
342
+ let (player, engine, _) = try makePlaying(live: true)
343
+ engine.emit(.playedToEnd)
344
+ await player.retry.pendingTask?.value
345
+ #expect(engine.resolveAndLoadCalls.count == 2)
346
+ #expect(engine.carrierAtLoad.last == true)
347
+ }
348
+
349
+ /// An on-demand item stays until the next is prepared: its duration and buffer still read from it.
350
+ @Test func anOnDemandReloadKeepsItsItem() throws {
351
+ let (player, engine, _) = try makePlaying()
352
+ player.retryNow()
353
+ #expect(engine.resolveAndLoadCalls.count == 2)
354
+ #expect(engine.carrierAtLoad.last == false)
355
+ #expect(engine.hasItem)
356
+ }
357
+
356
358
  /// AVPlayer pauses an item at its end, so a seek within its window would leave it silent.
357
359
  @Test func aLiveEndReconnectsEvenWithASeekableWindow() async throws {
358
360
  let (player, engine, _) = try makePlaying(live: true)
@@ -371,7 +373,6 @@ struct PlayerEngineEventTests {
371
373
  for _ in 0 ..< 20 where player.state != .error {
372
374
  engine.emit(.playedToEnd)
373
375
  await player.retry.pendingTask?.value
374
- engine.hasLoadedAsset = true
375
376
  engine.emit(.itemPrepared(likelyToKeepUp: true))
376
377
  }
377
378
  // The first connection played, so its end starts the count: four that deliver nothing follow.
@@ -602,8 +603,6 @@ struct PlayerRecoveringTests {
602
603
  /// Ready and waiting for AVPlayer to start: its waiting is a stall, watched in .buffering.
603
604
  @Test func aConnectThatIsReadyIsNoLongerWatched() async throws {
604
605
  let (player, engine, clock) = try makeConnecting()
605
- engine.hasItem = true
606
- engine.hasLoadedAsset = true
607
606
  engine.emit(.itemPrepared(likelyToKeepUp: true))
608
607
  #expect(player.state == .ready)
609
608
  await clock.run(until: 100_000)
@@ -954,8 +953,6 @@ struct PlayerRecoveringTests {
954
953
  let engine = MockPlayerEngine()
955
954
  let player = makePlayer(engine: engine, retry: makeRetryLoop(delay: 0.05))
956
955
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], playWhenReady: true)
957
- engine.hasItem = true
958
- engine.hasLoadedAsset = true
959
956
  engine.emit(.itemPrepared(likelyToKeepUp: true))
960
957
  player.transition(.avPlayerPlaying)
961
958
  #expect(player.retry.hasPlayed)
@@ -1224,7 +1221,6 @@ struct PlayerReviewRegressionTests {
1224
1221
  let player = makePlayer(engine: engine)
1225
1222
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
1226
1223
  engine.seekResult = nil
1227
- engine.hasItem = true
1228
1224
  engine.emit(.itemPrepared(likelyToKeepUp: true))
1229
1225
  // The failed item's own time.
1230
1226
  engine.resumePosition = 0
@@ -1244,7 +1240,6 @@ struct PlayerReviewRegressionTests {
1244
1240
  let player = makePlayer(engine: engine)
1245
1241
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], startPositionMs: 25000)
1246
1242
  engine.seekResult = nil
1247
- engine.hasItem = true
1248
1243
  engine.emit(.itemPrepared(likelyToKeepUp: true))
1249
1244
  engine.emit(.failed(nil, httpStatusCode: 404))
1250
1245
  #expect(player.state == .error)
@@ -1396,8 +1391,6 @@ struct PlayerReviewRegressionTests {
1396
1391
  let engine = MockPlayerEngine()
1397
1392
  let player = makePlayer(engine: engine, saveInterval: .milliseconds(10))
1398
1393
  try player.setQueue([Track(id: "t1", src: "https://example.com/a.mp3", title: "T")], playWhenReady: true)
1399
- engine.hasItem = true
1400
- engine.hasLoadedAsset = true
1401
1394
  engine.emit(.itemPrepared(likelyToKeepUp: true))
1402
1395
  player.transition(.avPlayerPlaying)
1403
1396
  engine.currentTime = 7
@@ -1485,8 +1478,6 @@ struct PlayerLivePauseTests {
1485
1478
  #expect(engine.resolveAndLoadCalls.count == 2)
1486
1479
  #expect(player.state == .loading)
1487
1480
 
1488
- engine.hasItem = true
1489
- engine.hasLoadedAsset = true
1490
1481
  engine.emit(.itemPrepared(likelyToKeepUp: true))
1491
1482
  #expect(engine.seekCalls.isEmpty)
1492
1483
  }
@@ -1843,4 +1834,36 @@ struct LateEngineEventTests {
1843
1834
  player.play()
1844
1835
  #expect(engine.resolveAndLoadCalls.count == 1)
1845
1836
  }
1837
+
1838
+ /// The stop keeps the on-demand item under observation, rewound to 0: its end, delivered after
1839
+ /// the stop, is not the track ending.
1840
+ @Test(arguments: [false, true])
1841
+ func aLatePlayedToEndAfterAStopLeavesTheQueueAlone(withANextTrack: Bool) throws {
1842
+ let (player, engine, callbacks) = try makePlaying()
1843
+ if withANextTrack {
1844
+ try player.add([Track(id: "t2", src: "https://example.com/b.mp3", title: "B")])
1845
+ }
1846
+ player.stop()
1847
+ let loads = engine.resolveAndLoadCalls.count
1848
+ let playbackChanges = callbacks.playbackChanges.count
1849
+ let activeTrackChanges = callbacks.activeTrackChanges.count
1850
+
1851
+ engine.emit(.playedToEnd)
1852
+
1853
+ #expect(player.queue.currentIndex == 0)
1854
+ #expect(player.state == .stopped)
1855
+ #expect(engine.resolveAndLoadCalls.count == loads)
1856
+ #expect(callbacks.playbackChanges.count == playbackChanges)
1857
+ #expect(callbacks.activeTrackChanges.count == activeTrackChanges)
1858
+ #expect(callbacks.queueEndedEvents.isEmpty)
1859
+ }
1860
+
1861
+ @Test func aLiveStopPausesBeforeTheCarrierGoesIn() throws {
1862
+ let (player, engine, _) = try makePlaying(live: true)
1863
+ engine.pauseAndCarrierOrder.removeAll()
1864
+ player.stop()
1865
+ let pause = try #require(engine.pauseAndCarrierOrder.firstIndex(of: .pause))
1866
+ let carrier = try #require(engine.pauseAndCarrierOrder.firstIndex(of: .carrier))
1867
+ #expect(pause < carrier)
1868
+ }
1846
1869
  }