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.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +37 -14
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +38 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +6 -41
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +40 -34
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +6 -5
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +12 -7
- package/android/src/main/java/com/audiobrowser/extension/QueueIndex.kt +19 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -1
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +32 -18
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +2 -2
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +17 -16
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +11 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +5 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +28 -21
- package/android/src/main/java/com/audiobrowser/player/Player.kt +41 -31
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +4 -0
- package/android/src/main/java/com/audiobrowser/player/ResolvingOnReloadSource.kt +38 -0
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +34 -19
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +10 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +48 -4
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +32 -34
- package/android/src/main/java/com/audiobrowser/util/SearchParamsFactory.kt +64 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +236 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +116 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +41 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +21 -4
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerPageShapeTest.kt +93 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerUnparsableResponseTest.kt +82 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +27 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +7 -1
- package/android/src/test/java/com/audiobrowser/browser/JsonFavoritedTest.kt +34 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/extension/QueueIndexTest.kt +44 -0
- package/android/src/test/java/com/audiobrowser/http/HttpClientTest.kt +34 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +90 -7
- package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +19 -2
- package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +17 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +39 -0
- package/android/src/test/java/com/audiobrowser/player/MediaUrlReloadTest.kt +212 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSeekSnapshotTest.kt +45 -0
- package/android/src/test/java/com/audiobrowser/player/SessionQueueShuffleOrderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +173 -0
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +127 -1
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +28 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +116 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +44 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +188 -0
- package/ios/Browser/BrowserError.swift +8 -0
- package/ios/Browser/BrowserManager.swift +29 -28
- package/ios/Browser/BrowserPathHelper.swift +26 -24
- package/ios/Browser/FavoriteSet.swift +16 -8
- package/ios/Browser/Favorites.swift +66 -0
- package/ios/Browser/JsonModels.swift +27 -7
- package/ios/Browser/NavigationErrorState.swift +18 -1
- package/ios/Browser/PageResolver.swift +2 -2
- package/ios/Browser/RequestLayer.swift +11 -4
- package/ios/Browser/RequestPipeline.swift +8 -4
- package/ios/Browser/TabBarEntries.swift +7 -0
- package/ios/CarPlay/CarPlayImageLoader.swift +3 -7
- package/ios/CarPlay/CarPlaySession+Navigator.swift +3 -1
- package/ios/CarPlay/IntentHandlers.swift +1 -7
- package/ios/CarPlay/MediaIntentCriteria.swift +4 -4
- package/ios/Extension/CGSize+AspectFit.swift +11 -0
- package/ios/Extension/Dictionary+Headers.swift +8 -0
- package/ios/Extension/NavigationError+Conversion.swift +4 -3
- package/ios/Extension/ResolvedTrack+Copying.swift +15 -0
- package/ios/Http/HttpClient.swift +37 -11
- package/ios/HybridAudioBrowser+Browser.swift +9 -16
- package/ios/HybridAudioBrowser+Options.swift +1 -0
- package/ios/HybridAudioBrowser+Player.swift +24 -23
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +1 -2
- package/ios/Model/NitroTypeStubs.swift +39 -0
- package/ios/Model/TrackPlayerError.swift +21 -2
- package/ios/Player/AudioSessionController.swift +2 -2
- package/ios/Player/MediaLoader.swift +1 -1
- package/ios/Player/PlaybackStateMachine.swift +1 -2
- package/ios/Player/Player.swift +59 -20
- package/ios/Player/PlayerEngine.swift +5 -0
- package/ios/Player/QueueManager.swift +21 -4
- package/ios/Tests/BrowserErrorTests.swift +21 -0
- package/ios/Tests/BrowserPathHelperTests.swift +18 -0
- package/ios/Tests/CGSizeAspectFitTests.swift +36 -0
- package/ios/Tests/ClampedVolumeTests.swift +26 -0
- package/ios/Tests/FavoriteSetTests.swift +68 -3
- package/ios/Tests/FavoritesTests.swift +102 -0
- package/ios/Tests/HttpClientUserAgentTests.swift +45 -0
- package/ios/Tests/JsonModelsTests.swift +74 -6
- package/ios/Tests/MediaIntentCriteriaTests.swift +11 -1
- package/ios/Tests/MediaLoaderAssetOptionsTests.swift +7 -0
- package/ios/Tests/NavigationErrorStateTests.swift +73 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +6 -4
- package/ios/Tests/PlayerPolicyTests.swift +38 -0
- package/ios/Tests/PlayerProgressTests.swift +109 -0
- package/ios/Tests/PlayerTests.swift +106 -0
- package/ios/Tests/QueueIndexTests.swift +43 -0
- package/ios/Tests/QueueManagerTests.swift +79 -15
- package/ios/Tests/RequestLayerTests.swift +22 -3
- package/ios/Tests/TabBarEntriesTests.swift +19 -0
- package/ios/Tests/TrackSelectorTests.swift +154 -0
- package/ios/Tests/UnparsableResponseTests.swift +91 -0
- package/ios/TrackSelector.swift +28 -8
- package/ios/Util/ArtworkImageFetcher.swift +9 -8
- package/ios/Util/SVGProcessor.swift +6 -17
- package/lib/commonjs/features/browser-config.js +6 -3
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/errors.js +12 -7
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +9 -3
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +1 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +2 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +2 -2
- package/lib/commonjs/features/queue/activeTrack.js +4 -2
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +6 -5
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +2 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +2 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/callListener.js +23 -0
- package/lib/commonjs/utils/callListener.js.map +1 -0
- package/lib/module/features/browser-config.js +6 -3
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/errors.js +12 -7
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/nowPlaying.js +9 -3
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/playback/controls.js +1 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +2 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/player/setup.js +2 -2
- package/lib/module/features/queue/activeTrack.js +4 -2
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/sleepTimer.js +6 -5
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +2 -1
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +2 -1
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/callListener.js +19 -0
- package/lib/module/utils/callListener.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +8 -6
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +2 -1
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +1 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +2 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts +2 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +2 -1
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +3 -2
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/callListener.d.ts +7 -0
- package/lib/typescript/src/utils/callListener.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/features/browser-config.test.ts +15 -0
- package/src/features/browser-config.ts +6 -3
- package/src/features/errors.test.ts +83 -0
- package/src/features/errors.ts +12 -7
- package/src/features/hook-wiring.test.ts +11 -10
- package/src/features/nowPlaying.ts +9 -3
- package/src/features/playback/controls.ts +1 -2
- package/src/features/playback/trackPlaybackTime.test.ts +24 -1
- package/src/features/playback/trackPlaybackTime.ts +2 -1
- package/src/features/player/setup.ts +2 -2
- package/src/features/queue/activeTrack.test.ts +32 -0
- package/src/features/queue/activeTrack.ts +8 -2
- package/src/features/sleepTimer.test.ts +24 -0
- package/src/features/sleepTimer.ts +6 -5
- package/src/types/browser.ts +3 -2
- package/src/utils/LazyNativeEmitter.test.ts +32 -0
- package/src/utils/LazyNativeEmitter.ts +3 -1
- package/src/utils/NativeUpdatedValue.test.ts +32 -0
- package/src/utils/NativeUpdatedValue.ts +3 -1
- package/src/utils/callListener.ts +17 -0
- package/website/guide/configuration.md +3 -3
- package/website/guide/errors.md +3 -1
- package/website/guide/live-streams.md +22 -20
|
@@ -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()
|
|
@@ -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
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import Testing
|
|
2
|
+
|
|
3
|
+
@testable import AudioBrowserTestable
|
|
4
|
+
|
|
5
|
+
@Suite("Int(queueIndex:)")
|
|
6
|
+
struct QueueIndexTests {
|
|
7
|
+
@Test(arguments: [
|
|
8
|
+
Double.nan,
|
|
9
|
+
.infinity,
|
|
10
|
+
-Double.infinity,
|
|
11
|
+
1e19,
|
|
12
|
+
-1e19,
|
|
13
|
+
Double(Int.max),
|
|
14
|
+
])
|
|
15
|
+
func numberNoIntHolds_throwsInvalidIndex(number: Double) {
|
|
16
|
+
let error = #expect(throws: TrackPlayerError.QueueError.self) {
|
|
17
|
+
_ = try Int(queueIndex: number)
|
|
18
|
+
}
|
|
19
|
+
guard case .invalidIndex(nil, _)? = error else {
|
|
20
|
+
Issue.record("expected invalidIndex without an index, got \(String(describing: error))")
|
|
21
|
+
return
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
@Test(arguments: [
|
|
26
|
+
(0.0, 0),
|
|
27
|
+
(2.0, 2),
|
|
28
|
+
(1.7, 1),
|
|
29
|
+
(-0.5, 0),
|
|
30
|
+
(-1.0, -1),
|
|
31
|
+
(Double(Int.min), Int.min),
|
|
32
|
+
])
|
|
33
|
+
func representableNumber_dropsTheFraction(number: Double, index: Int) throws {
|
|
34
|
+
#expect(try Int(queueIndex: number) == index)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
@Test func unrepresentableNumber_isNamedInTheMessage() {
|
|
38
|
+
let error = #expect(throws: TrackPlayerError.QueueError.self) {
|
|
39
|
+
_ = try Int(queueIndex: .nan)
|
|
40
|
+
}
|
|
41
|
+
#expect(error?.localizedDescription == "Invalid track index: index must be a finite number within the range of Int, got nan")
|
|
42
|
+
}
|
|
43
|
+
}
|
|
@@ -155,7 +155,7 @@ struct NextTests {
|
|
|
155
155
|
#expect(visited.count == 4)
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
-
@Test func
|
|
158
|
+
@Test func shuffle_atEnd_repeatOff_returnsNoChange() {
|
|
159
159
|
let q = QueueManager()
|
|
160
160
|
q.setQueue(tracks("a", "b", "c"))
|
|
161
161
|
q.shuffleEnabled = true
|
|
@@ -163,8 +163,21 @@ struct NextTests {
|
|
|
163
163
|
for _ in 0 ..< 2 {
|
|
164
164
|
_ = q.next()
|
|
165
165
|
}
|
|
166
|
-
let
|
|
167
|
-
#expect(
|
|
166
|
+
let last = q.currentIndex
|
|
167
|
+
#expect(q.next() == .noChange)
|
|
168
|
+
#expect(q.currentIndex == last)
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
@Test func shuffle_atEnd_repeatQueue_wrapsToFirstInOrder() {
|
|
172
|
+
let q = QueueManager()
|
|
173
|
+
q.setQueue(tracks("a", "b", "c"))
|
|
174
|
+
q.shuffleEnabled = true
|
|
175
|
+
q.repeatMode = .queue
|
|
176
|
+
for _ in 0 ..< 2 {
|
|
177
|
+
_ = q.next()
|
|
178
|
+
}
|
|
179
|
+
#expect(q.next() == .trackChanged)
|
|
180
|
+
#expect(q.currentIndex == q.shuffleOrder.firstIndex)
|
|
168
181
|
}
|
|
169
182
|
|
|
170
183
|
@Test func multipleTrack_repeatTrack_behavesLikeOff() {
|
|
@@ -202,17 +215,25 @@ struct PreviousTests {
|
|
|
202
215
|
#expect(q.currentIndex == 1)
|
|
203
216
|
}
|
|
204
217
|
|
|
205
|
-
@Test func
|
|
218
|
+
@Test func shuffle_atBeginning_repeatOff_returnsNoChange() {
|
|
206
219
|
let q = QueueManager()
|
|
207
220
|
q.setQueue(tracks("a", "b", "c"))
|
|
208
221
|
q.shuffleEnabled = true
|
|
209
222
|
q.repeatMode = .off
|
|
223
|
+
let first = q.currentIndex
|
|
224
|
+
#expect(q.shuffleOrder.isFirst(first))
|
|
225
|
+
#expect(q.previous() == .noChange)
|
|
226
|
+
#expect(q.currentIndex == first)
|
|
227
|
+
}
|
|
210
228
|
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
229
|
+
@Test func shuffle_atBeginning_repeatQueue_wrapsToLastInOrder() {
|
|
230
|
+
let q = QueueManager()
|
|
231
|
+
q.setQueue(tracks("a", "b", "c"))
|
|
232
|
+
q.shuffleEnabled = true
|
|
233
|
+
q.repeatMode = .queue
|
|
234
|
+
#expect(q.shuffleOrder.isFirst(q.currentIndex))
|
|
235
|
+
#expect(q.previous() == .trackChanged)
|
|
236
|
+
#expect(q.currentIndex == q.shuffleOrder.lastIndex)
|
|
216
237
|
}
|
|
217
238
|
|
|
218
239
|
@Test func singleTrack_repeatQueue_returnsSameTrackReplay() {
|
|
@@ -713,6 +734,27 @@ struct OtherMutationTests {
|
|
|
713
734
|
#expect(q.tracks[1].id == "B")
|
|
714
735
|
}
|
|
715
736
|
|
|
737
|
+
@Test func replaceEach_replacesTheTracksTheTransformReturns() {
|
|
738
|
+
let q = QueueManager()
|
|
739
|
+
q.setQueue(tracks("a", "b", "c"), initialIndex: 1)
|
|
740
|
+
|
|
741
|
+
let change = q.replaceEach { $0.id == "b" || $0.id == "c" ? Track(id: $0.id, title: "new") : nil }
|
|
742
|
+
|
|
743
|
+
#expect(change == .tracksOnly)
|
|
744
|
+
#expect(q.tracks.map(\.id) == ["a", "b", "c"])
|
|
745
|
+
#expect(q.tracks.map(\.title) == ["", "new", "new"])
|
|
746
|
+
#expect(q.currentIndex == 1)
|
|
747
|
+
}
|
|
748
|
+
|
|
749
|
+
@Test func replaceEach_changesNothingWhenNoTrackIsReplaced() {
|
|
750
|
+
let q = QueueManager()
|
|
751
|
+
q.setQueue(tracks("a", "b"))
|
|
752
|
+
let version = q.version
|
|
753
|
+
|
|
754
|
+
#expect(q.replaceEach { _ in nil } == .none)
|
|
755
|
+
#expect(q.version == version)
|
|
756
|
+
}
|
|
757
|
+
|
|
716
758
|
@Test func removeUpcomingTracks_alsoTrimsShuffleOrder() {
|
|
717
759
|
let q = QueueManager()
|
|
718
760
|
q.shuffleEnabled = true
|
|
@@ -871,6 +913,7 @@ struct ComputedPropertyTests {
|
|
|
871
913
|
_ = q.next()
|
|
872
914
|
}
|
|
873
915
|
#expect(q.isLastInPlaybackOrder == true)
|
|
916
|
+
q.repeatMode = .queue
|
|
874
917
|
_ = q.next()
|
|
875
918
|
#expect(q.isLastInPlaybackOrder == false)
|
|
876
919
|
}
|
|
@@ -1057,8 +1100,7 @@ struct SkipAvailabilityTests {
|
|
|
1057
1100
|
#expect(q.canPrevious == true)
|
|
1058
1101
|
}
|
|
1059
1102
|
|
|
1060
|
-
|
|
1061
|
-
@Test func shuffleEnd_repeatOff_canNextTrue() {
|
|
1103
|
+
@Test func shuffleEnd_repeatOff_previousOnly() {
|
|
1062
1104
|
let q = QueueManager()
|
|
1063
1105
|
q.setQueue(tracks("a", "b", "c", "d"))
|
|
1064
1106
|
q.shuffleEnabled = true
|
|
@@ -1066,17 +1108,39 @@ struct SkipAvailabilityTests {
|
|
|
1066
1108
|
while !q.isLastInPlaybackOrder {
|
|
1067
1109
|
_ = q.next()
|
|
1068
1110
|
}
|
|
1069
|
-
#expect(q.canNext ==
|
|
1111
|
+
#expect(q.canNext == false)
|
|
1112
|
+
#expect(q.canPrevious == true)
|
|
1070
1113
|
}
|
|
1071
1114
|
|
|
1072
|
-
@Test func
|
|
1115
|
+
@Test func shuffleStart_repeatOff_nextOnly() {
|
|
1073
1116
|
let q = QueueManager()
|
|
1074
1117
|
q.setQueue(tracks("a", "b", "c", "d"))
|
|
1075
1118
|
q.shuffleEnabled = true
|
|
1076
1119
|
q.repeatMode = .off
|
|
1077
|
-
|
|
1078
|
-
|
|
1120
|
+
#expect(q.shuffleOrder.isFirst(q.currentIndex))
|
|
1121
|
+
#expect(q.canNext == true)
|
|
1122
|
+
#expect(q.canPrevious == false)
|
|
1123
|
+
}
|
|
1124
|
+
|
|
1125
|
+
@Test func shuffleEnd_repeatQueue_bothTrue() {
|
|
1126
|
+
let q = QueueManager()
|
|
1127
|
+
q.setQueue(tracks("a", "b", "c", "d"))
|
|
1128
|
+
q.shuffleEnabled = true
|
|
1129
|
+
q.repeatMode = .queue
|
|
1130
|
+
while !q.isLastInPlaybackOrder {
|
|
1131
|
+
_ = q.next()
|
|
1079
1132
|
}
|
|
1133
|
+
#expect(q.canNext == true)
|
|
1134
|
+
#expect(q.canPrevious == true)
|
|
1135
|
+
}
|
|
1136
|
+
|
|
1137
|
+
@Test func shuffleStart_repeatQueue_bothTrue() {
|
|
1138
|
+
let q = QueueManager()
|
|
1139
|
+
q.setQueue(tracks("a", "b", "c", "d"))
|
|
1140
|
+
q.shuffleEnabled = true
|
|
1141
|
+
q.repeatMode = .queue
|
|
1142
|
+
#expect(q.shuffleOrder.isFirst(q.currentIndex))
|
|
1143
|
+
#expect(q.canNext == true)
|
|
1080
1144
|
#expect(q.canPrevious == true)
|
|
1081
1145
|
}
|
|
1082
1146
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import Foundation
|
|
1
2
|
import Testing
|
|
2
3
|
|
|
3
4
|
@testable import AudioBrowserTestable
|
|
@@ -79,10 +80,23 @@ struct RequestLayerTests {
|
|
|
79
80
|
#expect(applied == Config(path: "/page", baseUrl: "https://b"))
|
|
80
81
|
}
|
|
81
82
|
|
|
82
|
-
@Test func
|
|
83
|
-
struct Boom:
|
|
84
|
-
|
|
83
|
+
@Test func aFailingTransformThrowsACallbackErrorWithItsMessage() async {
|
|
84
|
+
struct Boom: LocalizedError {
|
|
85
|
+
var errorDescription: String? { "token expired" }
|
|
86
|
+
}
|
|
87
|
+
do {
|
|
85
88
|
_ = try await RequestLayer.apply(Config(), transforms: [{ _ in throw Boom() }], to: Config())
|
|
89
|
+
Issue.record("apply returned")
|
|
90
|
+
} catch let BrowserError.callbackError(message) {
|
|
91
|
+
#expect(message == "token expired")
|
|
92
|
+
} catch {
|
|
93
|
+
Issue.record("threw \(error)")
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
@Test func aCancelledTransformStaysACancellation() async {
|
|
98
|
+
await #expect(throws: CancellationError.self) {
|
|
99
|
+
_ = try await RequestLayer.apply(Config(), transforms: [{ _ in throw CancellationError() }], to: Config())
|
|
86
100
|
}
|
|
87
101
|
}
|
|
88
102
|
|
|
@@ -212,6 +226,7 @@ struct RequestLayerTests {
|
|
|
212
226
|
#expect(RequestLayer.imageHeaders(Config()) == nil)
|
|
213
227
|
#expect(RequestLayer.imageHeaders(Config(userAgent: "UA")) == ["User-Agent": "UA"])
|
|
214
228
|
#expect(RequestLayer.imageHeaders(Config(headers: ["User-Agent": "mine"], userAgent: "UA")) == ["User-Agent": "mine"])
|
|
229
|
+
#expect(RequestLayer.imageHeaders(Config(headers: ["user-agent": "mine"], userAgent: "UA")) == ["user-agent": "mine"])
|
|
215
230
|
}
|
|
216
231
|
|
|
217
232
|
@Test func imageHeadersAddTheContentTypeUnlessAHeaderSetsIt() {
|
|
@@ -220,6 +235,10 @@ struct RequestLayerTests {
|
|
|
220
235
|
RequestLayer.imageHeaders(Config(headers: ["Content-Type": "mine"], contentType: "image/png"))
|
|
221
236
|
== ["Content-Type": "mine"],
|
|
222
237
|
)
|
|
238
|
+
#expect(
|
|
239
|
+
RequestLayer.imageHeaders(Config(headers: ["content-type": "mine"], contentType: "image/png"))
|
|
240
|
+
== ["content-type": "mine"],
|
|
241
|
+
)
|
|
223
242
|
#expect(
|
|
224
243
|
RequestLayer.imageHeaders(Config(contentType: "image/png", userAgent: "UA"))
|
|
225
244
|
== ["Content-Type": "image/png", "User-Agent": "UA"],
|
|
@@ -66,4 +66,23 @@ struct TabBarEntriesTests {
|
|
|
66
66
|
[tab("Explore", path: "/explore", artist: "b")],
|
|
67
67
|
))
|
|
68
68
|
}
|
|
69
|
+
|
|
70
|
+
@Test func tabsThatGoAwayEmitAnEmptyList() {
|
|
71
|
+
#expect(TabBarEntries.change(from: [tab("Explore", path: "/explore")], to: nil)?.isEmpty == true)
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
@Test func noTabsBeforeOrAfterEmitsNothing() {
|
|
75
|
+
#expect(TabBarEntries.change(from: nil, to: nil) == nil)
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
@Test func newTabsEmitThem() {
|
|
79
|
+
let tabs = [tab("Explore", path: "/explore")]
|
|
80
|
+
#expect(TabBarEntries.change(from: nil, to: tabs)?.map(\.path) == ["/explore"])
|
|
81
|
+
#expect(TabBarEntries.change(from: [tab("Browse", path: "/browse")], to: tabs)?.map(\.path) == ["/explore"])
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
@Test func sameEntriesEmitNothing() {
|
|
85
|
+
let tabs = [tab("Explore", path: "/explore")]
|
|
86
|
+
#expect(TabBarEntries.change(from: tabs, to: tabs) == nil)
|
|
87
|
+
}
|
|
69
88
|
}
|