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

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 (190) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +37 -14
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +38 -10
  3. package/android/src/main/java/com/audiobrowser/Service.kt +6 -41
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +40 -34
  5. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +6 -5
  6. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +12 -7
  7. package/android/src/main/java/com/audiobrowser/extension/QueueIndex.kt +19 -0
  8. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -1
  9. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +32 -18
  10. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +2 -2
  11. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +17 -16
  12. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +11 -0
  13. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +5 -1
  14. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +28 -21
  15. package/android/src/main/java/com/audiobrowser/player/Player.kt +41 -31
  16. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +4 -0
  17. package/android/src/main/java/com/audiobrowser/player/ResolvingOnReloadSource.kt +38 -0
  18. package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +34 -19
  19. package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +10 -1
  20. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +48 -4
  21. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +32 -34
  22. package/android/src/main/java/com/audiobrowser/util/SearchParamsFactory.kt +64 -0
  23. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +236 -0
  24. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +116 -0
  25. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +41 -0
  26. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +21 -4
  27. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +49 -0
  28. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerPageShapeTest.kt +93 -0
  29. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerUnparsableResponseTest.kt +82 -0
  30. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +27 -0
  31. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +7 -1
  32. package/android/src/test/java/com/audiobrowser/browser/JsonFavoritedTest.kt +34 -0
  33. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +6 -6
  34. package/android/src/test/java/com/audiobrowser/extension/QueueIndexTest.kt +44 -0
  35. package/android/src/test/java/com/audiobrowser/http/HttpClientTest.kt +34 -0
  36. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +90 -7
  37. package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +19 -2
  38. package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +17 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +41 -0
  40. package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +39 -0
  41. package/android/src/test/java/com/audiobrowser/player/MediaUrlReloadTest.kt +212 -0
  42. package/android/src/test/java/com/audiobrowser/player/PlayerSeekSnapshotTest.kt +45 -0
  43. package/android/src/test/java/com/audiobrowser/player/SessionQueueShuffleOrderTest.kt +38 -0
  44. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +173 -0
  45. package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +127 -1
  46. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +28 -0
  47. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +116 -0
  48. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +44 -0
  49. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +188 -0
  50. package/ios/Browser/BrowserError.swift +8 -0
  51. package/ios/Browser/BrowserManager.swift +29 -28
  52. package/ios/Browser/BrowserPathHelper.swift +26 -24
  53. package/ios/Browser/FavoriteSet.swift +16 -8
  54. package/ios/Browser/Favorites.swift +66 -0
  55. package/ios/Browser/JsonModels.swift +27 -7
  56. package/ios/Browser/NavigationErrorState.swift +18 -1
  57. package/ios/Browser/PageResolver.swift +2 -2
  58. package/ios/Browser/RequestLayer.swift +11 -4
  59. package/ios/Browser/RequestPipeline.swift +8 -4
  60. package/ios/Browser/TabBarEntries.swift +7 -0
  61. package/ios/CarPlay/CarPlayImageLoader.swift +3 -7
  62. package/ios/CarPlay/CarPlaySession+Navigator.swift +3 -1
  63. package/ios/CarPlay/IntentHandlers.swift +1 -7
  64. package/ios/CarPlay/MediaIntentCriteria.swift +4 -4
  65. package/ios/Extension/CGSize+AspectFit.swift +11 -0
  66. package/ios/Extension/Dictionary+Headers.swift +8 -0
  67. package/ios/Extension/NavigationError+Conversion.swift +4 -3
  68. package/ios/Extension/ResolvedTrack+Copying.swift +15 -0
  69. package/ios/Http/HttpClient.swift +37 -11
  70. package/ios/HybridAudioBrowser+Browser.swift +9 -16
  71. package/ios/HybridAudioBrowser+Options.swift +1 -0
  72. package/ios/HybridAudioBrowser+Player.swift +24 -23
  73. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +1 -2
  74. package/ios/Model/NitroTypeStubs.swift +39 -0
  75. package/ios/Model/TrackPlayerError.swift +21 -2
  76. package/ios/Player/AudioSessionController.swift +2 -2
  77. package/ios/Player/MediaLoader.swift +1 -1
  78. package/ios/Player/PlaybackStateMachine.swift +1 -2
  79. package/ios/Player/Player.swift +59 -20
  80. package/ios/Player/PlayerEngine.swift +5 -0
  81. package/ios/Player/QueueManager.swift +21 -4
  82. package/ios/Tests/BrowserErrorTests.swift +21 -0
  83. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  84. package/ios/Tests/CGSizeAspectFitTests.swift +36 -0
  85. package/ios/Tests/ClampedVolumeTests.swift +26 -0
  86. package/ios/Tests/FavoriteSetTests.swift +68 -3
  87. package/ios/Tests/FavoritesTests.swift +102 -0
  88. package/ios/Tests/HttpClientUserAgentTests.swift +45 -0
  89. package/ios/Tests/JsonModelsTests.swift +74 -6
  90. package/ios/Tests/MediaIntentCriteriaTests.swift +11 -1
  91. package/ios/Tests/MediaLoaderAssetOptionsTests.swift +7 -0
  92. package/ios/Tests/NavigationErrorStateTests.swift +73 -0
  93. package/ios/Tests/PlaybackStateMachineTests.swift +6 -4
  94. package/ios/Tests/PlayerPolicyTests.swift +38 -0
  95. package/ios/Tests/PlayerProgressTests.swift +109 -0
  96. package/ios/Tests/PlayerTests.swift +106 -0
  97. package/ios/Tests/QueueIndexTests.swift +43 -0
  98. package/ios/Tests/QueueManagerTests.swift +79 -15
  99. package/ios/Tests/RequestLayerTests.swift +22 -3
  100. package/ios/Tests/TabBarEntriesTests.swift +19 -0
  101. package/ios/Tests/TrackSelectorTests.swift +154 -0
  102. package/ios/Tests/UnparsableResponseTests.swift +91 -0
  103. package/ios/TrackSelector.swift +28 -8
  104. package/ios/Util/ArtworkImageFetcher.swift +9 -8
  105. package/ios/Util/SVGProcessor.swift +6 -17
  106. package/lib/commonjs/features/browser-config.js +6 -3
  107. package/lib/commonjs/features/browser-config.js.map +1 -1
  108. package/lib/commonjs/features/errors.js +12 -7
  109. package/lib/commonjs/features/errors.js.map +1 -1
  110. package/lib/commonjs/features/nowPlaying.js +9 -3
  111. package/lib/commonjs/features/nowPlaying.js.map +1 -1
  112. package/lib/commonjs/features/playback/controls.js +1 -2
  113. package/lib/commonjs/features/playback/controls.js.map +1 -1
  114. package/lib/commonjs/features/playback/trackPlaybackTime.js +2 -1
  115. package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
  116. package/lib/commonjs/features/player/setup.js +2 -2
  117. package/lib/commonjs/features/queue/activeTrack.js +4 -2
  118. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  119. package/lib/commonjs/features/sleepTimer.js +6 -5
  120. package/lib/commonjs/features/sleepTimer.js.map +1 -1
  121. package/lib/commonjs/utils/LazyNativeEmitter.js +2 -1
  122. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  123. package/lib/commonjs/utils/NativeUpdatedValue.js +2 -1
  124. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  125. package/lib/commonjs/utils/callListener.js +23 -0
  126. package/lib/commonjs/utils/callListener.js.map +1 -0
  127. package/lib/module/features/browser-config.js +6 -3
  128. package/lib/module/features/browser-config.js.map +1 -1
  129. package/lib/module/features/errors.js +12 -7
  130. package/lib/module/features/errors.js.map +1 -1
  131. package/lib/module/features/nowPlaying.js +9 -3
  132. package/lib/module/features/nowPlaying.js.map +1 -1
  133. package/lib/module/features/playback/controls.js +1 -2
  134. package/lib/module/features/playback/controls.js.map +1 -1
  135. package/lib/module/features/playback/trackPlaybackTime.js +2 -1
  136. package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
  137. package/lib/module/features/player/setup.js +2 -2
  138. package/lib/module/features/queue/activeTrack.js +4 -2
  139. package/lib/module/features/queue/activeTrack.js.map +1 -1
  140. package/lib/module/features/sleepTimer.js +6 -5
  141. package/lib/module/features/sleepTimer.js.map +1 -1
  142. package/lib/module/utils/LazyNativeEmitter.js +2 -1
  143. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  144. package/lib/module/utils/NativeUpdatedValue.js +2 -1
  145. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  146. package/lib/module/utils/callListener.js +19 -0
  147. package/lib/module/utils/callListener.js.map +1 -0
  148. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  149. package/lib/typescript/src/features/errors.d.ts +8 -6
  150. package/lib/typescript/src/features/errors.d.ts.map +1 -1
  151. package/lib/typescript/src/features/nowPlaying.d.ts +2 -1
  152. package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
  153. package/lib/typescript/src/features/playback/controls.d.ts +1 -2
  154. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  155. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  156. package/lib/typescript/src/features/player/setup.d.ts +2 -2
  157. package/lib/typescript/src/features/queue/activeTrack.d.ts +2 -1
  158. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  159. package/lib/typescript/src/features/sleepTimer.d.ts +2 -1
  160. package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
  161. package/lib/typescript/src/types/browser.d.ts +3 -2
  162. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  163. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  164. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  165. package/lib/typescript/src/utils/callListener.d.ts +7 -0
  166. package/lib/typescript/src/utils/callListener.d.ts.map +1 -0
  167. package/package.json +1 -1
  168. package/src/features/browser-config.test.ts +15 -0
  169. package/src/features/browser-config.ts +6 -3
  170. package/src/features/errors.test.ts +83 -0
  171. package/src/features/errors.ts +12 -7
  172. package/src/features/hook-wiring.test.ts +11 -10
  173. package/src/features/nowPlaying.ts +9 -3
  174. package/src/features/playback/controls.ts +1 -2
  175. package/src/features/playback/trackPlaybackTime.test.ts +24 -1
  176. package/src/features/playback/trackPlaybackTime.ts +2 -1
  177. package/src/features/player/setup.ts +2 -2
  178. package/src/features/queue/activeTrack.test.ts +32 -0
  179. package/src/features/queue/activeTrack.ts +8 -2
  180. package/src/features/sleepTimer.test.ts +24 -0
  181. package/src/features/sleepTimer.ts +6 -5
  182. package/src/types/browser.ts +3 -2
  183. package/src/utils/LazyNativeEmitter.test.ts +32 -0
  184. package/src/utils/LazyNativeEmitter.ts +3 -1
  185. package/src/utils/NativeUpdatedValue.test.ts +32 -0
  186. package/src/utils/NativeUpdatedValue.ts +3 -1
  187. package/src/utils/callListener.ts +17 -0
  188. package/website/guide/configuration.md +3 -3
  189. package/website/guide/errors.md +3 -1
  190. package/website/guide/live-streams.md +22 -20
@@ -138,12 +138,13 @@ class QueueManager {
138
138
 
139
139
  // MARK: - Navigation (returns QueueNavigationResult)
140
140
 
141
- // Shared by `next()` and `canNext` so the button and the navigation agree. Shuffle wraps
142
- // whatever the repeat mode, as Media3 does; sequential order wraps only on repeat-queue.
141
+ // Shared by `next()` and `canNext` so the button and the navigation agree. Wraps only on
142
+ // repeat-queue, shuffled or not, as Media3 does.
143
143
  private var nextIndex: Int? {
144
144
  guard currentTrack != nil, tracks.count > 1 else { return nil }
145
145
  let candidate: Int? = if shuffleEnabled {
146
- shuffleOrder.getNextIndex(after: currentIndex) ?? shuffleOrder.firstIndex
146
+ shuffleOrder.getNextIndex(after: currentIndex)
147
+ ?? (repeatMode == .queue ? shuffleOrder.firstIndex : nil)
147
148
  } else if currentIndex + 1 < tracks.count {
148
149
  currentIndex + 1
149
150
  } else {
@@ -156,7 +157,8 @@ class QueueManager {
156
157
  private var previousIndex: Int? {
157
158
  guard currentTrack != nil, tracks.count > 1 else { return nil }
158
159
  let candidate: Int? = if shuffleEnabled {
159
- shuffleOrder.getPreviousIndex(before: currentIndex) ?? shuffleOrder.lastIndex
160
+ shuffleOrder.getPreviousIndex(before: currentIndex)
161
+ ?? (repeatMode == .queue ? shuffleOrder.lastIndex : nil)
160
162
  } else if currentIndex - 1 >= 0 {
161
163
  currentIndex - 1
162
164
  } else {
@@ -305,6 +307,21 @@ class QueueManager {
305
307
  return .tracksOnly
306
308
  }
307
309
 
310
+ /// Replaces, in place, each track `transform` returns a track for.
311
+ @discardableResult
312
+ func replaceEach(_ transform: (Track) -> Track?) -> QueueChange {
313
+ var updated = tracks
314
+ var replaced = false
315
+ for (index, track) in tracks.enumerated() {
316
+ guard let replacement = transform(track) else { continue }
317
+ updated[index] = replacement
318
+ replaced = true
319
+ }
320
+ guard replaced else { return .none }
321
+ tracks = updated
322
+ return .tracksOnly
323
+ }
324
+
308
325
  /// Removes the tracks after the current one in queue order, not shuffle order.
309
326
  @discardableResult
310
327
  func removeUpcomingTracks() -> QueueChange {
@@ -0,0 +1,21 @@
1
+ import Testing
2
+
3
+ @testable import AudioBrowserTestable
4
+
5
+ @Suite("BrowserError")
6
+ struct BrowserErrorTests {
7
+ @Test func aPathNoRouteMatchesIsContentNotFoundWithoutABaseUrl() {
8
+ guard case let .contentNotFound(path) = BrowserError.missingBaseUrl(path: "/nowhere", routed: false) else {
9
+ Issue.record("expected contentNotFound")
10
+ return
11
+ }
12
+ #expect(path == "/nowhere")
13
+ }
14
+
15
+ @Test func aRoutesRequestIsInvalidConfigurationWithoutABaseUrl() {
16
+ guard case .invalidConfiguration = BrowserError.missingBaseUrl(path: "/library", routed: true) else {
17
+ Issue.record("expected invalidConfiguration")
18
+ return
19
+ }
20
+ }
21
+ }
@@ -107,6 +107,24 @@ import Testing
107
107
  #expect(BrowserPathHelper.stripTrackId(url) == "/library")
108
108
  }
109
109
 
110
+ @Test(arguments: [
111
+ "/genres/Hip Hop",
112
+ "/genres/Électro",
113
+ "/list?tag=c%2B%2B",
114
+ "/list?sort=a%2Fb",
115
+ "/list?ids=[1]",
116
+ "/sale/50%",
117
+ "/list?x=%E9",
118
+ "/page#top",
119
+ ])
120
+ func buildRoundTripsAParentThatIsNotACanonicalUrl(parent: String) {
121
+ let identity = "id 1/é"
122
+ let url = BrowserPathHelper.build(parentPath: parent, trackId: identity, index: 2)
123
+ #expect(BrowserPathHelper.stripTrackId(url) == parent)
124
+ #expect(BrowserPathHelper.extractTrackId(url) == identity)
125
+ #expect(BrowserPathHelper.extractIndex(url) == 2)
126
+ }
127
+
110
128
  // MARK: - extractIndex
111
129
 
112
130
  @Test func extractIndexReturnsNilWithoutAStampedIndex() {
@@ -0,0 +1,36 @@
1
+ import CoreGraphics
2
+ import Testing
3
+
4
+ @testable import AudioBrowserTestable
5
+
6
+ @Suite("CGSize.aspectFitted(in:)")
7
+ struct CGSizeAspectFitTests {
8
+ private let slot = CGSize(width: 40, height: 40)
9
+
10
+ @Test func aLargeCanvasShrinksToTheSlot() {
11
+ #expect(CGSize(width: 1024, height: 1024).aspectFitted(in: slot) == slot)
12
+ }
13
+
14
+ @Test func aSmallCanvasGrowsToTheSlot() {
15
+ #expect(CGSize(width: 24, height: 24).aspectFitted(in: slot) == slot)
16
+ }
17
+
18
+ @Test func aWideCanvasKeepsItsAspectRatio() {
19
+ #expect(CGSize(width: 200, height: 100).aspectFitted(in: slot) == CGSize(width: 40, height: 20))
20
+ }
21
+
22
+ @Test func aTallCanvasKeepsItsAspectRatio() {
23
+ #expect(CGSize(width: 100, height: 400).aspectFitted(in: slot) == CGSize(width: 10, height: 40))
24
+ }
25
+
26
+ @Test(arguments: [
27
+ CGSize.zero,
28
+ CGSize(width: 100, height: 0),
29
+ CGSize(width: -10, height: 10),
30
+ CGSize(width: CGFloat.infinity, height: 10),
31
+ CGSize(width: CGFloat.nan, height: 10),
32
+ ])
33
+ func aCanvasWithoutAnAspectRatioHasNoFit(_ canvas: CGSize) {
34
+ #expect(canvas.aspectFitted(in: slot) == nil)
35
+ }
36
+ }
@@ -0,0 +1,26 @@
1
+ import Testing
2
+
3
+ @testable import AudioBrowserTestable
4
+
5
+ @Suite("clampedVolume")
6
+ struct ClampedVolumeTests {
7
+ @Test func keepsALevelInRange() {
8
+ #expect(clampedVolume(0) == 0)
9
+ #expect(clampedVolume(0.25) == 0.25)
10
+ #expect(clampedVolume(1) == 1)
11
+ }
12
+
13
+ @Test func raisesALevelBelowZeroToSilence() {
14
+ #expect(clampedVolume(-0.5) == 0)
15
+ #expect(clampedVolume(-.infinity) == 0)
16
+ }
17
+
18
+ @Test func lowersALevelAboveOneToFull() {
19
+ #expect(clampedVolume(1.5) == 1)
20
+ #expect(clampedVolume(.infinity) == 1)
21
+ }
22
+
23
+ @Test func hasNoVolumeForNaN() {
24
+ #expect(clampedVolume(.nan) == nil)
25
+ }
26
+ }
@@ -10,10 +10,10 @@ struct FavoriteSetTests {
10
10
  return set
11
11
  }
12
12
 
13
- @Test func replaceReportsWhetherTheIdentitiesChanged() {
13
+ @Test func replaceReportsTheIdentitiesThatChanged() {
14
14
  var set = FavoriteSet()
15
- let changes = [["a", "b"], ["b", "a"], ["a", "b", "a"], []].map { set.replace(with: $0) }
16
- #expect(changes == [true, false, false, true])
15
+ let changes = [["a", "b"], ["b", "a"], ["a", "b", "a"], ["b", "c"], []].map { set.replace(with: $0) }
16
+ #expect(changes == [["a", "b"], [], [], ["a", "c"], ["b", "c"]])
17
17
  }
18
18
 
19
19
  @Test func hydratesTrueOrFalseByIdentity() {
@@ -58,4 +58,69 @@ struct FavoriteSetTests {
58
58
  let hydrated = favorites(["b"]).hydrate(page)
59
59
  #expect(hydrated.sections?.map { $0.children.map(\.favorited) } == [[false], [true]])
60
60
  }
61
+
62
+ @Test func aHydratedTrackFollowsALaterReplace() throws {
63
+ var set = favorites([])
64
+ let queued = set.hydrate(Track(src: "a"))
65
+ #expect(queued.favorited == false)
66
+
67
+ let added = set.replace(with: ["a"])
68
+ let favorited = try #require(set.restamp(queued, changed: added))
69
+ #expect(favorited.favorited == true)
70
+
71
+ let removed = set.replace(with: [])
72
+ #expect(set.restamp(favorited, changed: removed)?.favorited == false)
73
+ }
74
+
75
+ @Test func restampFillsAnUnsetFlag() {
76
+ var set = favorites([])
77
+ let changed = set.replace(with: ["a"])
78
+ #expect(set.restamp(Track(src: "a"), changed: changed)?.favorited == true)
79
+ }
80
+
81
+ @Test func restampLeavesATrackWhoseIdentityDidNotChange() {
82
+ var set = favorites(["a"])
83
+ let changed = set.replace(with: ["a", "c"])
84
+ // Carried by the tracks themselves, against the set: only a change to their identity moves them.
85
+ #expect(set.restamp(Track(src: "a", favorited: false), changed: changed) == nil)
86
+ #expect(set.restamp(Track(src: "b", favorited: true), changed: changed) == nil)
87
+ }
88
+
89
+ @Test func restampLeavesATrackThatAlreadyAgrees() {
90
+ var set = favorites([])
91
+ let changed = set.replace(with: ["a"])
92
+ #expect(set.restamp(Track(src: "a", favorited: true), changed: changed) == nil)
93
+ }
94
+
95
+ @Test func restampOverwritesAStampedTrackWhenDisabled() {
96
+ var set = favorites(["a"], enabled: false)
97
+ let changed = set.replace(with: [])
98
+ #expect(set.restamp(Track(src: "a", favorited: true), changed: changed)?.favorited == false)
99
+ }
100
+
101
+ @Test func restampLeavesATrackWithoutIdentityAlone() {
102
+ var set = favorites([])
103
+ let changed = set.replace(with: ["/browse"])
104
+ #expect(set.restamp(Track(path: "/browse"), changed: changed) == nil)
105
+ }
106
+
107
+ @Test func restampsTheChangedTracksOfAPage() {
108
+ var set = favorites(["b"])
109
+ let page = set.hydrate(ResolvedTrack(
110
+ path: "/p",
111
+ sections: [Section(children: [Track(src: "a")]), Section(children: [Track(src: "b"), Track(src: "c")])],
112
+ title: "P",
113
+ ))
114
+ let changed = set.replace(with: ["a", "c"])
115
+ let restamped = page.replacingEachTrack { set.restamp($0, changed: changed) }
116
+ #expect(restamped?.sections?.map { $0.children.map(\.favorited) } == [[true], [false, true]])
117
+ #expect(restamped?.path == "/p")
118
+ }
119
+
120
+ @Test func aPageWithNoChangedTrackIsNotRestamped() {
121
+ var set = favorites(["b"])
122
+ let page = set.hydrate(ResolvedTrack(path: "/p", sections: [Section(children: [Track(src: "b")])], title: "P"))
123
+ let changed = set.replace(with: ["b", "elsewhere"])
124
+ #expect(page.replacingEachTrack { set.restamp($0, changed: changed) } == nil)
125
+ }
61
126
  }
@@ -0,0 +1,102 @@
1
+ import Testing
2
+
3
+ @testable import AudioBrowserTestable
4
+
5
+ @MainActor
6
+ private final class Holder: FavoriteStamped {
7
+ var tracks: [Track]
8
+ let name: String
9
+ let log: Log
10
+
11
+ init(_ name: String, _ tracks: [Track], log: Log) {
12
+ self.name = name
13
+ self.tracks = tracks
14
+ self.log = log
15
+ }
16
+
17
+ func restampFavorites(_ restamp: (Track) -> Track?) {
18
+ log.entries.append(name)
19
+ tracks = tracks.map { restamp($0) ?? $0 }
20
+ }
21
+ }
22
+
23
+ private final class Log {
24
+ var entries: [String] = []
25
+ }
26
+
27
+ @MainActor
28
+ struct FavoritesTests {
29
+ private let log = Log()
30
+
31
+ private func makeFavorites(content: [Track] = [], queue: [Track] = []) -> (Favorites, Holder, Holder) {
32
+ let content = Holder("content", content, log: log)
33
+ let queue = Holder("queue", queue, log: log)
34
+ let favorites = Favorites(content: content)
35
+ favorites.enabled = true
36
+ favorites.queue = queue
37
+ favorites.changed.addListener { [log] in log.entries.append("changed") }
38
+ return (favorites, content, queue)
39
+ }
40
+
41
+ @Test func aReplaceRestampsTheContentThenTheQueueThenEmits() {
42
+ let (favorites, content, queue) = makeFavorites(
43
+ content: [Track(src: "a", favorited: false)],
44
+ queue: [Track(src: "a", favorited: false), Track(src: "b", favorited: false)],
45
+ )
46
+
47
+ favorites.replace(with: ["a"])
48
+
49
+ #expect(log.entries == ["content", "queue", "changed"])
50
+ #expect(content.tracks.map(\.favorited) == [true])
51
+ #expect(queue.tracks.map(\.favorited) == [true, false])
52
+ }
53
+
54
+ @Test func aReplaceThatChangesNothingRestampsNothing() {
55
+ let (favorites, _, _) = makeFavorites()
56
+ favorites.replace(with: [])
57
+ #expect(log.entries.isEmpty)
58
+ }
59
+
60
+ @Test func aToggleRestampsEveryCopyOfTheTrack() {
61
+ let a = Track(src: "a", favorited: false)
62
+ let (favorites, content, queue) = makeFavorites(content: [a], queue: [a, Track(src: "b"), a])
63
+
64
+ favorites.set("a", favorited: true)
65
+
66
+ #expect(log.entries == ["content", "queue", "changed"])
67
+ #expect(content.tracks.map(\.favorited) == [true])
68
+ #expect(queue.tracks.map(\.favorited) == [true, nil, true])
69
+ }
70
+
71
+ @Test func aToggleRestampsACopyThatDisagreesWithTheSet() {
72
+ let (favorites, _, queue) = makeFavorites(queue: [Track(src: "a", favorited: false)])
73
+ favorites.replace(with: ["a"])
74
+ queue.tracks = [Track(src: "a", favorited: false)]
75
+
76
+ favorites.set("a", favorited: true)
77
+
78
+ #expect(queue.tracks.map(\.favorited) == [true])
79
+ }
80
+
81
+ @Test func aReplaceWhileDisabledReachesAStampedCopy() {
82
+ let (favorites, _, queue) = makeFavorites(queue: [Track(src: "a", favorited: false)])
83
+ favorites.replace(with: ["a"])
84
+ favorites.enabled = false
85
+
86
+ favorites.replace(with: [])
87
+ favorites.enabled = true
88
+
89
+ #expect(queue.tracks.map(\.favorited) == [false])
90
+ }
91
+
92
+ @Test func theQueueIsThePlayer() throws {
93
+ let player = makePlayer()
94
+ let favorites = Favorites(content: Holder("content", [], log: log))
95
+ favorites.queue = player
96
+ try player.setQueue([Track(src: "a", favorited: false), Track(src: "a", favorited: false)])
97
+
98
+ favorites.set("a", favorited: true)
99
+
100
+ #expect(player.tracks.map(\.favorited) == [true, true])
101
+ }
102
+ }
@@ -0,0 +1,45 @@
1
+ @testable import AudioBrowserTestable
2
+ import Foundation
3
+ import Testing
4
+
5
+ /// Answers every request with the `User-Agent` it carries, as `{"userAgent": …}`.
6
+ private final class EchoUserAgentProtocol: URLProtocol {
7
+ override class func canInit(with _: URLRequest) -> Bool {
8
+ true
9
+ }
10
+
11
+ override class func canonicalRequest(for request: URLRequest) -> URLRequest {
12
+ request
13
+ }
14
+
15
+ override func startLoading() {
16
+ let body = ["userAgent": request.value(forHTTPHeaderField: "User-Agent") ?? ""]
17
+ let response = HTTPURLResponse(url: request.url!, statusCode: 200, httpVersion: "HTTP/1.1", headerFields: nil)!
18
+ client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)
19
+ client?.urlProtocol(self, didLoad: try! JSONEncoder().encode(body))
20
+ client?.urlProtocolDidFinishLoading(self)
21
+ }
22
+
23
+ override func stopLoading() {}
24
+ }
25
+
26
+ @Suite("The User-Agent an HTTP request carries")
27
+ struct HttpClientUserAgentTests {
28
+ /// The `User-Agent` sent for a request with `headers` and the default `userAgent`.
29
+ private func sentUserAgent(headers: [String: String]) async throws -> String? {
30
+ let configuration = URLSessionConfiguration.ephemeral
31
+ configuration.protocolClasses = [EchoUserAgentProtocol.self]
32
+ let request = HttpClient.HttpRequest(
33
+ url: "https://stub.invalid/", method: .get, headers: headers, body: nil,
34
+ contentType: HttpClient.defaultContentType, userAgent: HttpClient.defaultUserAgent,
35
+ )
36
+ let session = URLSession(configuration: configuration)
37
+ defer { session.finishTasksAndInvalidate() }
38
+ return try await HttpClient(session: session).requestJson(request, as: [String: String].self)["userAgent"]
39
+ }
40
+
41
+ @Test(arguments: ["user-agent", "USER-AGENT"])
42
+ func aHeaderWinsOverTheFieldInAnyCase(name: String) async throws {
43
+ #expect(try await sentUserAgent(headers: [name: "MyApp/1.0"]) == "MyApp/1.0")
44
+ }
45
+ }
@@ -43,7 +43,7 @@ struct JsonTrackArtworkTests {
43
43
  { "title": "Playlist", "artwork": { "light": "https://e.example/l.png", "dark": "https://e.example/d.png" } }
44
44
  ] }
45
45
  """.data(using: .utf8)!
46
- let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro()
46
+ let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/requested")
47
47
  #expect(resolved.children?.first?.artwork?.variants?.dark == "https://e.example/d.png")
48
48
  }
49
49
 
@@ -56,6 +56,41 @@ struct JsonTrackArtworkTests {
56
56
  }
57
57
  }
58
58
 
59
+ @Suite("JsonTrack.favorited")
60
+ struct JsonTrackFavoritedTests {
61
+ private func track(_ json: String) throws -> Track {
62
+ try JSONDecoder().decode(JsonTrack.self, from: Data(json.utf8)).toNitro()
63
+ }
64
+
65
+ @Test func decodesTheValueTheResponseCarries() throws {
66
+ #expect(try track(#"{ "title": "X", "src": "a", "favorited": true }"#).favorited == true)
67
+ #expect(try track(#"{ "title": "X", "src": "a", "favorited": false }"#).favorited == false)
68
+ #expect(try track(#"{ "title": "X", "src": "a" }"#).favorited == nil)
69
+ }
70
+
71
+ @Test func theValueOfTheResponseWinsOverHydration() throws {
72
+ var favorites = FavoriteSet()
73
+ favorites.enabled = true
74
+ _ = favorites.replace(with: ["b"])
75
+ let hearted = try track(#"{ "title": "A", "src": "a", "favorited": true }"#)
76
+ let unhearted = try track(#"{ "title": "B", "src": "b", "favorited": false }"#)
77
+ #expect(favorites.hydrate(hearted).favorited == true)
78
+ #expect(favorites.hydrate(unhearted).favorited == false)
79
+ }
80
+
81
+ @Test func decodesOnAPageAndOnItsTracks() throws {
82
+ let json = Data(
83
+ """
84
+ {"path":"/track/1","title":"Page","src":"p","favorited":true,"sections":[
85
+ {"children":[{"title":"A","src":"a","favorited":true},{"title":"B","src":"b"}]}
86
+ ]}
87
+ """.utf8)
88
+ let page = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/track/1")
89
+ #expect(page.favorited == true)
90
+ #expect(page.sections?.first?.children.map(\.favorited) == [true, nil])
91
+ }
92
+ }
93
+
59
94
  // MARK: - Style blocks (ADR 0011)
60
95
 
61
96
  @Suite("JsonTrack.style")
@@ -77,7 +112,7 @@ struct JsonStyleTests {
77
112
  {"style":{"display":"grid","gridWrap":false},"children":[{"title":"C","src":"s"}]}
78
113
  ]}
79
114
  """.utf8)
80
- let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro()
115
+ let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/requested")
81
116
  let style = resolved.sections?.first?.style
82
117
  #expect(style?.display == .grid)
83
118
  #expect(style?.gridWrap == false)
@@ -91,7 +126,7 @@ struct JsonStyleTests {
91
126
  {"title":"C","src":"s","style":"grid"}
92
127
  ]}
93
128
  """.utf8)
94
- let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro()
129
+ let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/requested")
95
130
  #expect(resolved.style == nil)
96
131
  #expect(resolved.children?.first?.style == nil)
97
132
  }
@@ -152,7 +187,7 @@ struct JsonStyleTests {
152
187
  "children":[{"title":"C","src":"s"}]}
153
188
  ]}
154
189
  """.utf8)
155
- let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro()
190
+ let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/requested")
156
191
  let style = resolved.sections?.first?.style
157
192
  #expect(style?.gridTile == .card)
158
193
  #expect(style?.cardTint == "#1e3a8a")
@@ -167,7 +202,7 @@ struct JsonStyleTests {
167
202
  "children":[{"title":"C","src":"s"}]}
168
203
  ]}
169
204
  """.utf8)
170
- let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro()
205
+ let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/requested")
171
206
  let style = resolved.sections?.first?.style
172
207
  #expect(style?.gridTile == .image)
173
208
  #expect(style?.imageShape == .circular)
@@ -180,7 +215,7 @@ struct JsonStyleTests {
180
215
  {"style":{"gridTile":"hexagon"},"children":[{"title":"C","src":"s"}]}
181
216
  ]}
182
217
  """.utf8)
183
- let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro()
218
+ let resolved = try JSONDecoder().decode(JsonResolvedTrack.self, from: json).toNitro(requestedPath: "/requested")
184
219
  #expect(resolved.sections?.first?.style == nil)
185
220
  }
186
221
 
@@ -214,6 +249,39 @@ struct JsonStyleTests {
214
249
  }
215
250
  }
216
251
 
252
+ @Suite("The page an endpoint answers")
253
+ struct JsonPageShapeTests {
254
+ @Test func aBrowsePageWithoutAPathTakesTheRequestedPath() throws {
255
+ let json = Data(#"{"title":"Jazz","children":[{"title":"C","src":"s"}]}"#.utf8)
256
+ let page = try JSONDecoder().decode(JsonBrowsePage.self, from: json).page.toNitro(requestedPath: "/genres/jazz")
257
+ #expect(page.path == "/genres/jazz")
258
+ #expect(page.title == "Jazz")
259
+ #expect(page.children?.map(\.title) == ["C"])
260
+ }
261
+
262
+ @Test func aPagesOwnPathWins() throws {
263
+ let json = Data(#"{"path":"/jazz","title":"Jazz"}"#.utf8)
264
+ let page = try JSONDecoder().decode(JsonBrowsePage.self, from: json).page.toNitro(requestedPath: "/genres/jazz")
265
+ #expect(page.path == "/jazz")
266
+ }
267
+
268
+ @Test func aTabsPageNeedsNeitherTitleNorPath() throws {
269
+ let json = Data(#"{"children":[{"title":"Home","path":"/home"}]}"#.utf8)
270
+ let page = try JSONDecoder().decode(JsonResolvedTrack.self, from: json)
271
+ .toNitro(requestedPath: SimpleRouter.tabsRoutePath)
272
+ #expect(page.title == "")
273
+ #expect(page.path == SimpleRouter.tabsRoutePath)
274
+ #expect(page.children?.map(\.path) == ["/home"])
275
+ }
276
+
277
+ @Test func aBrowsePageWithoutATitleDoesNotDecode() {
278
+ let json = Data(#"{"children":[]}"#.utf8)
279
+ #expect(throws: DecodingError.self) {
280
+ _ = try JSONDecoder().decode(JsonBrowsePage.self, from: json)
281
+ }
282
+ }
283
+ }
284
+
217
285
  @Suite("JsonTrack persistence")
218
286
  struct JsonTrackPersistenceTests {
219
287
  @Test func aTrackSurvivesTheRoundTripThroughItsSnapshot() throws {
@@ -10,7 +10,7 @@ private func criteria(
10
10
  mediaTypeMode: String? = nil,
11
11
  reference: MediaIntentCriteria.Reference = .unknown,
12
12
  hasMediaType: Bool = false,
13
- // A query names the app on a whole-word subset match either way, so "Acme" matches.
13
+ // A query names the app when all its words are words of the app name, so "Acme" matches.
14
14
  appName: String? = "Acme Radio",
15
15
  ) -> MediaIntentCriteria {
16
16
  MediaIntentCriteria(
@@ -67,6 +67,16 @@ struct MediaIntentCriteriaTests {
67
67
  #expect(!criteria(mediaName: "jazz").isResume)
68
68
  }
69
69
 
70
+ @Test func queryHoldingTheAppNameAndMore_isNotResume() {
71
+ let c = criteria(mediaName: "Acme Radio Northside", hasMediaType: true)
72
+ #expect(!c.matchesAppName)
73
+ #expect(!c.isResume)
74
+
75
+ let oneWordApp = criteria(mediaName: "Acme Northside", hasMediaType: true, appName: "Acme")
76
+ #expect(!oneWordApp.matchesAppName)
77
+ #expect(!oneWordApp.isResume)
78
+ }
79
+
70
80
  @Test func emptyGenreName_isStillAGenreFilter() {
71
81
  let c = criteria(genreNames: [""])
72
82
  #expect(c.genre == "")
@@ -28,6 +28,13 @@ struct BuildAssetOptionsTests {
28
28
  #expect(headerFields(options)?["User-Agent"] == "Explicit")
29
29
  }
30
30
 
31
+ @Test func explicitUserAgentHeaderWinsInAnyCase() {
32
+ let options = MediaLoader.buildAssetOptions(
33
+ headers: ["user-agent": "Explicit"], userAgent: "TestAgent/1.0",
34
+ )
35
+ #expect(headerFields(options) == ["user-agent": "Explicit"])
36
+ }
37
+
31
38
  @Test func headersOnly_nilUserAgent_keepsHeaders() {
32
39
  let options = MediaLoader.buildAssetOptions(headers: ["X-Test": "1"], userAgent: nil)
33
40
  #expect(headerFields(options)?["X-Test"] == "1")
@@ -0,0 +1,73 @@
1
+ import Foundation
2
+ import Testing
3
+
4
+ @testable import AudioBrowserTestable
5
+
6
+ @MainActor
7
+ @Suite("NavigationErrorState")
8
+ struct NavigationErrorStateTests {
9
+ private final class Events {
10
+ var errors: [NavigationErrorType?] = []
11
+ var displays: [String?] = []
12
+ }
13
+
14
+ private let events = Events()
15
+ private let state: NavigationErrorState
16
+
17
+ init() {
18
+ let events = events
19
+ state = NavigationErrorState(
20
+ onErrorChanged: { events.errors.append($0?.code) },
21
+ onFormattedChanged: { events.displays.append($0?.title) },
22
+ )
23
+ }
24
+
25
+ private func follow(_ load: () async throws -> Bool) async {
26
+ await state.follow(
27
+ load,
28
+ describe: { _ in NavigationError(code: .networkError, message: "offline", statusCode: nil, statusCodeSuccess: nil) },
29
+ format: { FormattedNavigationError(title: "Network Error", message: $0.message) },
30
+ )
31
+ }
32
+
33
+ private func failANavigation() async {
34
+ await follow { throw URLError(.notConnectedToInternet) }
35
+ }
36
+
37
+ @Test func aLoadThatThrowsReportsTheErrorAndItsDisplay() async {
38
+ await failANavigation()
39
+
40
+ #expect(state.error?.code == .networkError)
41
+ #expect(state.formatted?.title == "Network Error")
42
+ #expect(events.errors == [.networkError])
43
+ #expect(events.displays == ["Network Error"])
44
+ }
45
+
46
+ @Test func aLoadThatPublishesItsContentClearsTheError() async {
47
+ await failANavigation()
48
+
49
+ await follow { true }
50
+
51
+ #expect(state.error == nil)
52
+ #expect(state.formatted == nil)
53
+ #expect(events.errors == [.networkError, nil])
54
+ #expect(events.displays == ["Network Error", nil])
55
+ }
56
+
57
+ @Test func aLoadThatPublishesWithNoErrorSetEmitsNothing() async {
58
+ await follow { true }
59
+
60
+ #expect(events.errors.isEmpty)
61
+ #expect(events.displays.isEmpty)
62
+ }
63
+
64
+ @Test func aSupersededLoadKeepsTheError() async {
65
+ await failANavigation()
66
+
67
+ await follow { false }
68
+
69
+ #expect(state.error?.code == .networkError)
70
+ #expect(state.formatted?.title == "Network Error")
71
+ #expect(events.errors == [.networkError])
72
+ }
73
+ }
@@ -98,17 +98,19 @@ struct AVPlayerPausedTests {
98
98
  #expect(nextPlaybackState(from: .stopped, on: .avPlayerPaused(hasAsset: false)) == nil)
99
99
  }
100
100
 
101
- @Test func fromError_hasAssetTrue_isSuppressed() {
101
+ @Test func fromError_isSuppressed() {
102
102
  #expect(nextPlaybackState(from: .error, on: .avPlayerPaused(hasAsset: true)) == nil)
103
+ #expect(nextPlaybackState(from: .error, on: .avPlayerPaused(hasAsset: false)) == nil)
103
104
  }
104
105
 
105
- @Test func fromEnded_hasAssetTrue_isSuppressed() {
106
+ @Test func fromEnded_isSuppressed() {
106
107
  #expect(nextPlaybackState(from: .ended, on: .avPlayerPaused(hasAsset: true)) == nil)
108
+ #expect(nextPlaybackState(from: .ended, on: .avPlayerPaused(hasAsset: false)) == nil)
107
109
  }
108
110
 
109
111
  @Test func hasAssetFalse_transitionsToNone() {
110
- let nonStoppedStates = allStates.filter { $0 != .stopped }
111
- for state in nonStoppedStates {
112
+ let validStates = allStates.filter { $0 != .stopped && $0 != .error && $0 != .ended }
113
+ for state in validStates {
112
114
  #expect(
113
115
  nextPlaybackState(from: state, on: .avPlayerPaused(hasAsset: false)) == PlaybackState.none,
114
116
  "Expected .none from \(state) with hasAsset: false",