react-native-audio-browser 1.0.0-next.1 → 1.0.0-next.3

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 (147) hide show
  1. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +19 -2
  2. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +29 -8
  3. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +8 -10
  4. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +2 -2
  5. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +17 -16
  6. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +11 -0
  7. package/android/src/main/java/com/audiobrowser/player/Player.kt +8 -4
  8. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +236 -0
  9. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerUnparsableResponseTest.kt +82 -0
  10. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +15 -0
  11. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +26 -0
  12. package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +19 -2
  13. package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +17 -0
  14. package/android/src/test/java/com/audiobrowser/player/SessionQueueShuffleOrderTest.kt +38 -0
  15. package/ios/Browser/BrowserError.swift +8 -0
  16. package/ios/Browser/BrowserManager.swift +29 -28
  17. package/ios/Browser/BrowserPathHelper.swift +26 -24
  18. package/ios/Browser/FavoriteSet.swift +16 -8
  19. package/ios/Browser/Favorites.swift +66 -0
  20. package/ios/Browser/JsonModels.swift +27 -7
  21. package/ios/Browser/NavigationErrorState.swift +18 -1
  22. package/ios/Browser/PageResolver.swift +2 -2
  23. package/ios/Browser/RequestLayer.swift +11 -4
  24. package/ios/Browser/RequestPipeline.swift +8 -4
  25. package/ios/Browser/TabBarEntries.swift +7 -0
  26. package/ios/CarPlay/CarPlayImageLoader.swift +3 -7
  27. package/ios/CarPlay/CarPlaySession+Navigator.swift +3 -1
  28. package/ios/CarPlay/IntentHandlers.swift +1 -7
  29. package/ios/CarPlay/MediaIntentCriteria.swift +4 -4
  30. package/ios/Extension/CGSize+AspectFit.swift +11 -0
  31. package/ios/Extension/Dictionary+Headers.swift +8 -0
  32. package/ios/Extension/NavigationError+Conversion.swift +4 -3
  33. package/ios/Extension/ResolvedTrack+Copying.swift +15 -0
  34. package/ios/Http/HttpClient.swift +37 -11
  35. package/ios/HybridAudioBrowser+Browser.swift +9 -16
  36. package/ios/HybridAudioBrowser+Options.swift +1 -0
  37. package/ios/HybridAudioBrowser+Player.swift +24 -23
  38. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +1 -2
  39. package/ios/Model/NitroTypeStubs.swift +39 -0
  40. package/ios/Model/TrackPlayerError.swift +21 -2
  41. package/ios/Player/AudioSessionController.swift +2 -2
  42. package/ios/Player/MediaLoader.swift +1 -1
  43. package/ios/Player/PlaybackStateMachine.swift +13 -12
  44. package/ios/Player/Player.swift +60 -21
  45. package/ios/Player/PlayerEngine.swift +5 -0
  46. package/ios/Player/QueueManager.swift +21 -4
  47. package/ios/Tests/BrowserErrorTests.swift +21 -0
  48. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  49. package/ios/Tests/CGSizeAspectFitTests.swift +36 -0
  50. package/ios/Tests/ClampedVolumeTests.swift +26 -0
  51. package/ios/Tests/FavoriteSetTests.swift +68 -3
  52. package/ios/Tests/FavoritesTests.swift +102 -0
  53. package/ios/Tests/HttpClientUserAgentTests.swift +45 -0
  54. package/ios/Tests/JsonModelsTests.swift +74 -6
  55. package/ios/Tests/MediaIntentCriteriaTests.swift +11 -1
  56. package/ios/Tests/MediaLoaderAssetOptionsTests.swift +7 -0
  57. package/ios/Tests/NavigationErrorStateTests.swift +73 -0
  58. package/ios/Tests/PlaybackStateMachineTests.swift +21 -12
  59. package/ios/Tests/PlayerPolicyTests.swift +103 -0
  60. package/ios/Tests/PlayerProgressTests.swift +109 -0
  61. package/ios/Tests/PlayerTests.swift +106 -0
  62. package/ios/Tests/QueueIndexTests.swift +43 -0
  63. package/ios/Tests/QueueManagerTests.swift +79 -15
  64. package/ios/Tests/RequestLayerTests.swift +22 -3
  65. package/ios/Tests/TabBarEntriesTests.swift +19 -0
  66. package/ios/Tests/TrackSelectorTests.swift +154 -0
  67. package/ios/Tests/UnparsableResponseTests.swift +91 -0
  68. package/ios/TrackSelector.swift +28 -8
  69. package/ios/Util/ArtworkImageFetcher.swift +9 -8
  70. package/ios/Util/SVGProcessor.swift +6 -17
  71. package/lib/commonjs/features/browser-config.js +6 -3
  72. package/lib/commonjs/features/browser-config.js.map +1 -1
  73. package/lib/commonjs/features/errors.js +12 -7
  74. package/lib/commonjs/features/errors.js.map +1 -1
  75. package/lib/commonjs/features/nowPlaying.js +9 -3
  76. package/lib/commonjs/features/nowPlaying.js.map +1 -1
  77. package/lib/commonjs/features/playback/trackPlaybackTime.js +2 -1
  78. package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
  79. package/lib/commonjs/features/player/setup.js +2 -2
  80. package/lib/commonjs/features/queue/activeTrack.js +4 -2
  81. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  82. package/lib/commonjs/features/sleepTimer.js +6 -5
  83. package/lib/commonjs/features/sleepTimer.js.map +1 -1
  84. package/lib/commonjs/utils/LazyNativeEmitter.js +2 -1
  85. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  86. package/lib/commonjs/utils/NativeUpdatedValue.js +2 -1
  87. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  88. package/lib/commonjs/utils/callListener.js +23 -0
  89. package/lib/commonjs/utils/callListener.js.map +1 -0
  90. package/lib/module/features/browser-config.js +6 -3
  91. package/lib/module/features/browser-config.js.map +1 -1
  92. package/lib/module/features/errors.js +12 -7
  93. package/lib/module/features/errors.js.map +1 -1
  94. package/lib/module/features/nowPlaying.js +9 -3
  95. package/lib/module/features/nowPlaying.js.map +1 -1
  96. package/lib/module/features/playback/trackPlaybackTime.js +2 -1
  97. package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
  98. package/lib/module/features/player/setup.js +2 -2
  99. package/lib/module/features/queue/activeTrack.js +4 -2
  100. package/lib/module/features/queue/activeTrack.js.map +1 -1
  101. package/lib/module/features/sleepTimer.js +6 -5
  102. package/lib/module/features/sleepTimer.js.map +1 -1
  103. package/lib/module/utils/LazyNativeEmitter.js +2 -1
  104. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  105. package/lib/module/utils/NativeUpdatedValue.js +2 -1
  106. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  107. package/lib/module/utils/callListener.js +19 -0
  108. package/lib/module/utils/callListener.js.map +1 -0
  109. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  110. package/lib/typescript/src/features/errors.d.ts +8 -6
  111. package/lib/typescript/src/features/errors.d.ts.map +1 -1
  112. package/lib/typescript/src/features/nowPlaying.d.ts +2 -1
  113. package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
  114. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  115. package/lib/typescript/src/features/player/setup.d.ts +2 -2
  116. package/lib/typescript/src/features/queue/activeTrack.d.ts +2 -1
  117. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  118. package/lib/typescript/src/features/sleepTimer.d.ts +2 -1
  119. package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
  120. package/lib/typescript/src/types/browser.d.ts +3 -2
  121. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  122. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  123. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  124. package/lib/typescript/src/utils/callListener.d.ts +7 -0
  125. package/lib/typescript/src/utils/callListener.d.ts.map +1 -0
  126. package/package.json +1 -1
  127. package/src/features/browser-config.test.ts +15 -0
  128. package/src/features/browser-config.ts +6 -3
  129. package/src/features/errors.test.ts +83 -0
  130. package/src/features/errors.ts +12 -7
  131. package/src/features/hook-wiring.test.ts +11 -10
  132. package/src/features/nowPlaying.ts +9 -3
  133. package/src/features/playback/trackPlaybackTime.test.ts +24 -1
  134. package/src/features/playback/trackPlaybackTime.ts +2 -1
  135. package/src/features/player/setup.ts +2 -2
  136. package/src/features/queue/activeTrack.test.ts +32 -0
  137. package/src/features/queue/activeTrack.ts +8 -2
  138. package/src/features/sleepTimer.test.ts +24 -0
  139. package/src/features/sleepTimer.ts +6 -5
  140. package/src/types/browser.ts +3 -2
  141. package/src/utils/LazyNativeEmitter.test.ts +32 -0
  142. package/src/utils/LazyNativeEmitter.ts +3 -1
  143. package/src/utils/NativeUpdatedValue.test.ts +32 -0
  144. package/src/utils/NativeUpdatedValue.ts +3 -1
  145. package/src/utils/callListener.ts +17 -0
  146. package/website/guide/configuration.md +3 -3
  147. package/website/guide/errors.md +3 -1
@@ -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
+ }
@@ -39,27 +39,34 @@ struct UnconditionalEventTests {
39
39
  }
40
40
  }
41
41
 
42
- @Test func avPlayerWaiting_transitionsToBuffering_exceptFromError() {
42
+ @Test func errorOccurred_alwaysTransitionsToError() {
43
43
  for state in allStates {
44
- #expect(nextPlaybackState(from: state, on: .avPlayerWaiting) == (state == .error ? nil : .buffering))
44
+ #expect(nextPlaybackState(from: state, on: .errorOccurred(dummyError)) == .error)
45
45
  }
46
46
  }
47
+ }
47
48
 
48
- @Test func avPlayerPlaying_transitionsToPlaying_exceptFromError() {
49
+ // MARK: - AVPlayer events
50
+
51
+ @Suite("AVPlayer events — held by .stopped, .ended and .error")
52
+ struct EngineEventTests {
53
+ private let terminalStates: [PlaybackState] = [.stopped, .ended, .error]
54
+
55
+ @Test func avPlayerWaiting_transitionsToBuffering_exceptFromATerminalState() {
49
56
  for state in allStates {
50
- #expect(nextPlaybackState(from: state, on: .avPlayerPlaying) == (state == .error ? nil : .playing))
57
+ #expect(nextPlaybackState(from: state, on: .avPlayerWaiting) == (terminalStates.contains(state) ? nil : .buffering))
51
58
  }
52
59
  }
53
60
 
54
- @Test func audioFrameDecoded_transitionsToPlaying_exceptFromError() {
61
+ @Test func avPlayerPlaying_transitionsToPlaying_exceptFromATerminalState() {
55
62
  for state in allStates {
56
- #expect(nextPlaybackState(from: state, on: .audioFrameDecoded) == (state == .error ? nil : .playing))
63
+ #expect(nextPlaybackState(from: state, on: .avPlayerPlaying) == (terminalStates.contains(state) ? nil : .playing))
57
64
  }
58
65
  }
59
66
 
60
- @Test func errorOccurred_alwaysTransitionsToError() {
67
+ @Test func audioFrameDecoded_transitionsToPlaying_exceptFromATerminalState() {
61
68
  for state in allStates {
62
- #expect(nextPlaybackState(from: state, on: .errorOccurred(dummyError)) == .error)
69
+ #expect(nextPlaybackState(from: state, on: .audioFrameDecoded) == (terminalStates.contains(state) ? nil : .playing))
63
70
  }
64
71
  }
65
72
  }
@@ -91,17 +98,19 @@ struct AVPlayerPausedTests {
91
98
  #expect(nextPlaybackState(from: .stopped, on: .avPlayerPaused(hasAsset: false)) == nil)
92
99
  }
93
100
 
94
- @Test func fromError_hasAssetTrue_isSuppressed() {
101
+ @Test func fromError_isSuppressed() {
95
102
  #expect(nextPlaybackState(from: .error, on: .avPlayerPaused(hasAsset: true)) == nil)
103
+ #expect(nextPlaybackState(from: .error, on: .avPlayerPaused(hasAsset: false)) == nil)
96
104
  }
97
105
 
98
- @Test func fromEnded_hasAssetTrue_isSuppressed() {
106
+ @Test func fromEnded_isSuppressed() {
99
107
  #expect(nextPlaybackState(from: .ended, on: .avPlayerPaused(hasAsset: true)) == nil)
108
+ #expect(nextPlaybackState(from: .ended, on: .avPlayerPaused(hasAsset: false)) == nil)
100
109
  }
101
110
 
102
111
  @Test func hasAssetFalse_transitionsToNone() {
103
- let nonStoppedStates = allStates.filter { $0 != .stopped }
104
- for state in nonStoppedStates {
112
+ let validStates = allStates.filter { $0 != .stopped && $0 != .error && $0 != .ended }
113
+ for state in validStates {
105
114
  #expect(
106
115
  nextPlaybackState(from: state, on: .avPlayerPaused(hasAsset: false)) == PlaybackState.none,
107
116
  "Expected .none from \(state) with hasAsset: false",
@@ -280,6 +280,17 @@ struct PlayerEngineEventTests {
280
280
  #expect(engine.resolveAndLoadCalls.count == 2)
281
281
  }
282
282
 
283
+ /// An on-demand pause keeps its item, whose first audio can be reported after the pause.
284
+ @Test func audioReportedAfterAPauseKeepsItPaused() throws {
285
+ let (player, engine, _) = try makePlaying()
286
+ player.pause()
287
+ engine.emit(.timeControlStatus(.paused, waitingForNoItem: false))
288
+ #expect(player.state == .paused)
289
+
290
+ engine.emit(.audioDidStart)
291
+ #expect(player.state == .paused)
292
+ }
293
+
283
294
  @Test func aPauseWhileLoadingReachesTheEngine_aPlayDoesNot() throws {
284
295
  let (player, engine, _) = try makeLoading()
285
296
  player.setPlayWhenReady(true)
@@ -1299,6 +1310,33 @@ struct PlayerReviewRegressionTests {
1299
1310
  #expect(player.deferredSeek.target == 120)
1300
1311
  }
1301
1312
 
1313
+ @Test func aSeekWhilePausedSavesWhereItLands() throws {
1314
+ UserDefaults(suiteName: "PlayerTests")!.removePersistentDomain(forName: "PlayerTests")
1315
+ let (player, engine, _) = try makePlaying()
1316
+ engine.currentTime = 120
1317
+ player.pause()
1318
+ engine.seekResult = nil
1319
+ player.seek(to: 30)
1320
+ // A seek inside the buffer lands without any engine event.
1321
+ engine.currentTime = 30
1322
+ engine.completeSeeks(true)
1323
+ let saved = PlaybackPersistence(defaults: UserDefaults(suiteName: "PlayerTests")!) { nil }.load()
1324
+ #expect(saved?.positionMs == 30000)
1325
+ }
1326
+
1327
+ @Test func aSeekInAnErrorSavesItsTarget() throws {
1328
+ UserDefaults(suiteName: "PlayerTests")!.removePersistentDomain(forName: "PlayerTests")
1329
+ let (player, engine, _) = try makePlaying()
1330
+ engine.currentTime = 120
1331
+ engine.resumePosition = 120
1332
+ engine.emit(.failed(nil, httpStatusCode: 404))
1333
+ #expect(player.state == .error)
1334
+
1335
+ player.seek(to: 30)
1336
+ let saved = PlaybackPersistence(defaults: UserDefaults(suiteName: "PlayerTests")!) { nil }.load()
1337
+ #expect(saved?.positionMs == 30000)
1338
+ }
1339
+
1302
1340
  @Test func aFailedSkipKeepsTheNewTrackAtItsStart() throws {
1303
1341
  UserDefaults(suiteName: "PlayerTests")!.removePersistentDomain(forName: "PlayerTests")
1304
1342
  let (player, engine, _) = try makePlaying()
@@ -1741,3 +1779,68 @@ struct PlayerLivePauseTests {
1741
1779
  #expect(callbacks.errorEvents.isEmpty)
1742
1780
  }
1743
1781
  }
1782
+
1783
+ /// A stopped or ended track plays again only through a reload: an AVPlayer event that lands after
1784
+ /// the stop or the end must not move it out of that state, or the next play resumes the item left
1785
+ /// behind.
1786
+ @Suite("A late AVPlayer event does not cost the next play its reload")
1787
+ @MainActor
1788
+ struct LateEngineEventTests {
1789
+ enum LateAfterStop: String, CaseIterable, Sendable {
1790
+ case liveLatePlayingThenPaused = "live, a late playing then paused status"
1791
+ case liveLateFirstAudio = "live, a late first audio"
1792
+ case onDemandLateWaitingAfterTheRewind = "on-demand, a late waiting status after the rewind"
1793
+ case onDemandLatePlaying = "on-demand, a late playing status"
1794
+
1795
+ var live: Bool {
1796
+ switch self {
1797
+ case .liveLatePlayingThenPaused, .liveLateFirstAudio: true
1798
+ case .onDemandLateWaitingAfterTheRewind, .onDemandLatePlaying: false
1799
+ }
1800
+ }
1801
+
1802
+ var events: [EngineEvent] {
1803
+ switch self {
1804
+ case .liveLatePlayingThenPaused:
1805
+ [.timeControlStatus(.playing, waitingForNoItem: false), .timeControlStatus(.paused, waitingForNoItem: false)]
1806
+ case .liveLateFirstAudio: [.audioDidStart]
1807
+ case .onDemandLateWaitingAfterTheRewind: [.timeControlStatus(.waitingToPlayAtSpecifiedRate, waitingForNoItem: false)]
1808
+ case .onDemandLatePlaying: [.timeControlStatus(.playing, waitingForNoItem: false)]
1809
+ }
1810
+ }
1811
+ }
1812
+
1813
+ @Test(arguments: LateAfterStop.allCases)
1814
+ func aStoppedTrackReloadsOnPlay(_ late: LateAfterStop) throws {
1815
+ let (player, engine, _) = try makePlaying(live: late.live)
1816
+ player.stop()
1817
+ for event in late.events {
1818
+ engine.emit(event)
1819
+ }
1820
+ #expect(player.state == .stopped)
1821
+ engine.resolveAndLoadCalls.removeAll()
1822
+ player.play()
1823
+ #expect(engine.resolveAndLoadCalls.count == 1)
1824
+ }
1825
+
1826
+ @Test func anEndedTrackReloadsOnPlayAfterALateWaitingStatus() throws {
1827
+ let (player, engine, _) = try makePlaying()
1828
+ engine.currentTime = 300
1829
+ engine.duration = 300
1830
+ engine.emit(.playedToEnd)
1831
+ engine.emit(.timeControlStatus(.waitingToPlayAtSpecifiedRate, waitingForNoItem: false))
1832
+ #expect(player.state == .ended)
1833
+ engine.resolveAndLoadCalls.removeAll()
1834
+ player.play()
1835
+ #expect(engine.resolveAndLoadCalls.count == 1)
1836
+ }
1837
+
1838
+ @Test func aSecondStopThenPlayReloads() throws {
1839
+ let (player, engine, _) = try makePlaying(live: true)
1840
+ player.stop()
1841
+ player.stop()
1842
+ engine.resolveAndLoadCalls.removeAll()
1843
+ player.play()
1844
+ #expect(engine.resolveAndLoadCalls.count == 1)
1845
+ }
1846
+ }
@@ -0,0 +1,109 @@
1
+ @testable import AudioBrowserTestable
2
+ import Foundation
3
+ import Testing
4
+ import XCTest
5
+
6
+ /// The first of three on-demand tracks plays at 120 s of 300 s, 180 s buffered. The mock engine,
7
+ /// like AVPlayer, goes on reporting that item until the next one is prepared.
8
+ @MainActor
9
+ private func makePlayingFirstOfThree() throws -> (Player, MockPlayerEngine, MockPlayerCallbacks) {
10
+ let engine = MockPlayerEngine()
11
+ let player = makePlayer(engine: engine)
12
+ let callbacks = MockPlayerCallbacks()
13
+ player.callbacks = callbacks
14
+ try player.setQueue(
15
+ ["a", "b", "c"].map { Track(id: $0, src: "https://example.com/\($0).mp3", title: $0) },
16
+ playWhenReady: true,
17
+ )
18
+ playPreparedItem(player, engine)
19
+ engine.currentTime = 120
20
+ engine.resumePosition = 120
21
+ engine.duration = 300
22
+ engine.bufferedPosition = 180
23
+ return (player, engine, callbacks)
24
+ }
25
+
26
+ @MainActor
27
+ private func playPreparedItem(_ player: Player, _ engine: MockPlayerEngine) {
28
+ engine.hasItem = true
29
+ engine.hasLoadedAsset = true
30
+ engine.emit(.itemPrepared(likelyToKeepUp: true))
31
+ player.transition(.avPlayerPlaying)
32
+ }
33
+
34
+ @Suite("Player - progress")
35
+ @MainActor
36
+ struct PlayerProgressTests {
37
+ @Test func thePositionWhileATrackLoadsIsWhereItWillStart() throws {
38
+ let (player, _, _) = try makePlayingFirstOfThree()
39
+ #expect(player.currentTime == 120)
40
+
41
+ player.next()
42
+ #expect(player.state == .loading)
43
+ #expect(player.currentTime == 0)
44
+
45
+ player.seek(to: 30)
46
+ #expect(player.currentTime == 30)
47
+ }
48
+
49
+ /// A reload of the same track leaves its previous item in the engine, which still says how long
50
+ /// the track is.
51
+ @Test func aReloadOfTheTrackKeepsItsDurationAndReportsWhereItResumes() throws {
52
+ let (player, _, _) = try makePlayingFirstOfThree()
53
+
54
+ player.retryNow()
55
+ #expect(player.state == .loading)
56
+ #expect(player.currentTime == 120)
57
+ #expect(player.duration == 300)
58
+ #expect(player.bufferedPosition == 180)
59
+ }
60
+
61
+ @Test func aTrackSkippedWhileItLoadedWasLeftAtItsOwnPosition() throws {
62
+ let (player, _, callbacks) = try makePlayingFirstOfThree()
63
+
64
+ player.next()
65
+ #expect(callbacks.activeTrackChanges.last?.lastPosition == 120)
66
+
67
+ player.next()
68
+ #expect(callbacks.activeTrackChanges.last?.lastTrack?.id == "b")
69
+ #expect(callbacks.activeTrackChanges.last?.lastPosition == 0)
70
+ }
71
+ }
72
+
73
+ /// XCTest, whose runner turns the main run loop the progress timer fires on.
74
+ @MainActor
75
+ final class PlayerProgressEventTests: XCTestCase {
76
+ /// The next progress event the timer emits, at a 10 ms interval.
77
+ private func nextProgress(
78
+ _ player: Player, _ callbacks: MockPlayerCallbacks,
79
+ ) async throws -> PlaybackProgressUpdatedEvent {
80
+ callbacks.progressUpdates.removeAll()
81
+ player.setProgressUpdateInterval(0.01)
82
+ defer { player.setProgressUpdateInterval(nil) }
83
+ for _ in 0 ..< 500 where callbacks.progressUpdates.isEmpty {
84
+ try await Task.sleep(for: .milliseconds(10))
85
+ }
86
+ return try XCTUnwrap(callbacks.progressUpdates.first)
87
+ }
88
+
89
+ func testProgressWhileTheNextTrackLoadsIsNotThePreviousTracks() async throws {
90
+ let (player, engine, callbacks) = try makePlayingFirstOfThree()
91
+
92
+ player.next()
93
+ XCTAssertEqual(player.state, .loading)
94
+ let loading = try await nextProgress(player, callbacks)
95
+ XCTAssertEqual(loading.track, 1)
96
+ XCTAssertEqual(loading.position, 0)
97
+ XCTAssertEqual(loading.duration, 0)
98
+ XCTAssertEqual(loading.buffered, 0)
99
+
100
+ engine.currentTime = 0
101
+ engine.duration = 200
102
+ engine.bufferedPosition = 10
103
+ playPreparedItem(player, engine)
104
+ let playing = try await nextProgress(player, callbacks)
105
+ XCTAssertEqual(playing.track, 1)
106
+ XCTAssertEqual(playing.duration, 200)
107
+ XCTAssertEqual(playing.buffered, 10)
108
+ }
109
+ }
@@ -587,6 +587,7 @@ struct ObserverGuardTests {
587
587
  @Test @MainActor
588
588
  func audioDidStart_transitionsToPlaying() {
589
589
  let (c, eh, _, _) = makeCoordinator()
590
+ c.setPlayWhenReady(true)
590
591
  c.transition(.bufferingSufficient)
591
592
 
592
593
  eh.emit(.audioDidStart)
@@ -787,6 +788,23 @@ struct HandleCurrentTrackChangedTests {
787
788
  #expect(cb.errorEvents.count >= 1)
788
789
  }
789
790
 
791
+ @Test @MainActor
792
+ func nilSrc_errorHoldsAgainstThePauseOfTheReplacedTrack() throws {
793
+ let (c, eh, cb, _) = makeCoordinator()
794
+ try c.setQueue([
795
+ Track(id: "t1", src: "https://example.com/1.mp3", title: "Track 1"),
796
+ Track(id: "t2", path: "/no-source", src: nil, title: "No Source"),
797
+ ])
798
+ try c.skipTo(1)
799
+ cb.errorEvents.removeAll()
800
+
801
+ eh.emit(.timeControlStatus(.paused, waitingForNoItem: false))
802
+
803
+ #expect(c.state == .error)
804
+ #expect(c.errorStatus.error == .invalidSourceUrl("nil"))
805
+ #expect(cb.errorEvents.isEmpty)
806
+ }
807
+
790
808
  @Test @MainActor
791
809
  func nilSrc_emitsActiveTrackChangedEvent() throws {
792
810
  let (c, _, cb, _) = makeCoordinator()
@@ -1214,6 +1232,25 @@ struct InterruptionTests {
1214
1232
 
1215
1233
  #expect(c.playWhenReady == false)
1216
1234
  }
1235
+
1236
+ /// `.error` keeps the play intent, but the interruption stopped nothing: its end must not
1237
+ /// restart the stream.
1238
+ @Test @MainActor
1239
+ func ended_doesNotRestart_whenInterruptedInError() throws {
1240
+ let (c, eh, _, _) = makeCoordinator()
1241
+ try startPlaying(c, eh)
1242
+ c.transition(.errorOccurred(.playbackFailed))
1243
+ #expect(c.playWhenReady == true)
1244
+ let resolvesBefore = eh.resolveAndLoadCalls.count
1245
+
1246
+ c.handleInterruptionBegan()
1247
+ #expect(c.willResumeAfterInterruption == false)
1248
+ c.handleInterruptionEnded(shouldResume: true)
1249
+
1250
+ #expect(c.state == .error)
1251
+ #expect(c.playWhenReady == false)
1252
+ #expect(eh.resolveAndLoadCalls.count == resolvesBefore)
1253
+ }
1217
1254
  }
1218
1255
 
1219
1256
  // MARK: - Skip availability freshness
@@ -1357,6 +1394,31 @@ struct QueuePublicationTests {
1357
1394
  #expect(cb.queueChanges.map { $0.map(\.id) } == [["b", "c", "a"]])
1358
1395
  }
1359
1396
 
1397
+ @Test @MainActor
1398
+ func replaceEach_publishesTheQueueOnceAndKeepsTheActiveTrack() throws {
1399
+ let (c, eh, cb, _) = makeCoordinator()
1400
+ try c.setQueue(threeTracks())
1401
+ cb.queueChanges.removeAll()
1402
+ cb.activeTrackChanges.removeAll()
1403
+ let loads = eh.resolveAndLoadCalls.count
1404
+
1405
+ c.replaceEach { $0.id == "b" ? nil : $0.copying(favorited: true) }
1406
+
1407
+ #expect(cb.queueChanges.map { $0.map(\.favorited) } == [[true, nil, true]])
1408
+ #expect(c.currentTrack?.favorited == true)
1409
+ #expect(cb.activeTrackChanges.isEmpty)
1410
+ #expect(eh.resolveAndLoadCalls.count == loads)
1411
+ }
1412
+
1413
+ @Test @MainActor
1414
+ func replaceEach_publishesNothingWhenNoTrackIsReplaced() throws {
1415
+ let (c, _, cb, _) = makeCoordinator()
1416
+ try c.setQueue(threeTracks())
1417
+ cb.queueChanges.removeAll()
1418
+ c.replaceEach { _ in nil }
1419
+ #expect(cb.queueChanges.isEmpty)
1420
+ }
1421
+
1360
1422
  @Test @MainActor
1361
1423
  func clear_publishesAnEmptyQueue() throws {
1362
1424
  let (c, _, cb, _) = makeCoordinator()
@@ -1482,6 +1544,50 @@ struct SessionReleaseTests {
1482
1544
 
1483
1545
  #expect(eh.scheduleAudioSessionReleaseCount == 1)
1484
1546
  }
1547
+
1548
+ /// `.error` keeps the play intent, so the release cannot wait for a pause.
1549
+ @Test @MainActor
1550
+ func terminalError_requestsRelease_withTheIntentHeld() throws {
1551
+ let (c, eh, _, _) = makeCoordinator()
1552
+ try startPlaying(c, eh)
1553
+ eh.scheduleAudioSessionReleaseCount = 0
1554
+
1555
+ c.transition(.errorOccurred(.playbackFailed))
1556
+
1557
+ #expect(c.playWhenReady == true)
1558
+ #expect(eh.scheduleAudioSessionReleaseCount == 1)
1559
+ #expect(c.canReleaseAudioSession == true)
1560
+ }
1561
+
1562
+ /// A play from `.error` activates the session, which cancels the pending release, and leaves
1563
+ /// `canReleaseAudioSession` false for the controller's check when the release fires.
1564
+ @Test @MainActor
1565
+ func playFromError_activatesTheSession_andBlocksTheRelease() throws {
1566
+ let (c, eh, _, _) = makeCoordinator()
1567
+ try startPlaying(c, eh)
1568
+ c.transition(.errorOccurred(.playbackFailed))
1569
+ eh.activateAudioSessionCount = 0
1570
+
1571
+ c.play()
1572
+
1573
+ #expect(c.state == .loading)
1574
+ #expect(c.canReleaseAudioSession == false)
1575
+ #expect(eh.activateAudioSessionCount == 1)
1576
+ }
1577
+
1578
+ @Test @MainActor
1579
+ func canReleaseAudioSession_waitsForAnInterruptionThatMayResume() throws {
1580
+ let (c, eh, _, _) = makeCoordinator()
1581
+ try startPlaying(c, eh)
1582
+ #expect(c.canReleaseAudioSession == false)
1583
+
1584
+ c.handleInterruptionBegan()
1585
+ #expect(c.playWhenReady == false)
1586
+ #expect(c.canReleaseAudioSession == false)
1587
+
1588
+ c.handleInterruptionEnded(shouldResume: false)
1589
+ #expect(c.canReleaseAudioSession == true)
1590
+ }
1485
1591
  }
1486
1592
 
1487
1593
  // MARK: - Media-stack effects of a publish