react-native-audio-browser 1.0.0-next.4 → 1.0.0-next.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +41 -6
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
- package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
- package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
- package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
- package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
- package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +11 -9
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
- package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
- package/ios/CarPlay/SectionPresentation.swift +7 -0
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Model/NitroTypeStubs.swift +15 -0
- package/ios/Model/PlayerUpdateOptions.swift +2 -1
- package/ios/PlaybackEvent.swift +20 -0
- package/ios/Player/Player.swift +17 -3
- package/ios/Player/QueueManager.swift +23 -41
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/BrowserPathHelperTests.swift +18 -0
- package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
- package/ios/Tests/PlayerPolicyTests.swift +51 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/PlayerTests.swift +54 -0
- package/ios/Tests/QueueManagerTests.swift +111 -78
- package/ios/Tests/RequestLayerTests.swift +11 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/SectionPresentationTests.swift +13 -0
- package/ios/Tests/Support/TestTypes.swift +23 -1
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +19 -1
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +55 -8
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/features/player/options.ts +19 -1
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/carplay.md +1 -1
- package/website/guide/configuration.md +10 -9
- package/website/guide/gate.md +1 -1
- package/website/guide/remote-controls.md +35 -0
|
@@ -25,8 +25,6 @@ private func makePlayingFirstOfThree() throws -> (Player, MockPlayerEngine, Mock
|
|
|
25
25
|
|
|
26
26
|
@MainActor
|
|
27
27
|
private func playPreparedItem(_ player: Player, _ engine: MockPlayerEngine) {
|
|
28
|
-
engine.hasItem = true
|
|
29
|
-
engine.hasLoadedAsset = true
|
|
30
28
|
engine.emit(.itemPrepared(likelyToKeepUp: true))
|
|
31
29
|
player.transition(.avPlayerPlaying)
|
|
32
30
|
}
|
|
@@ -1335,6 +1335,60 @@ struct PublishingTests {
|
|
|
1335
1335
|
}
|
|
1336
1336
|
}
|
|
1337
1337
|
|
|
1338
|
+
// MARK: - Skip to the failed active track
|
|
1339
|
+
|
|
1340
|
+
@Suite("Player - skip to the failed active track")
|
|
1341
|
+
struct SkipToFailedTrackTests {
|
|
1342
|
+
/// A player whose only track failed at 42 s.
|
|
1343
|
+
@MainActor
|
|
1344
|
+
private func failedPlayer() throws -> (Player, MockPlayerEngine) {
|
|
1345
|
+
let (c, eh, _, _) = makeCoordinator()
|
|
1346
|
+
try loadTrack(c)
|
|
1347
|
+
eh.emit(.itemPrepared(likelyToKeepUp: false))
|
|
1348
|
+
c.transition(.errorOccurred(.playbackFailed))
|
|
1349
|
+
eh.resumePosition = 42
|
|
1350
|
+
return (c, eh)
|
|
1351
|
+
}
|
|
1352
|
+
|
|
1353
|
+
@Test @MainActor
|
|
1354
|
+
func reloadsWithoutAPlayIntent_fromTheStart() throws {
|
|
1355
|
+
let (c, eh) = try failedPlayer()
|
|
1356
|
+
c.seek(to: 30)
|
|
1357
|
+
let resolvesBefore = eh.resolveAndLoadCalls.count
|
|
1358
|
+
|
|
1359
|
+
try c.skipTo(0)
|
|
1360
|
+
|
|
1361
|
+
#expect(eh.resolveAndLoadCalls.count == resolvesBefore + 1)
|
|
1362
|
+
#expect(c.state == .loading)
|
|
1363
|
+
#expect(!c.playWhenReady)
|
|
1364
|
+
#expect((c.deferredSeek.target ?? 0) == 0)
|
|
1365
|
+
}
|
|
1366
|
+
|
|
1367
|
+
@Test @MainActor
|
|
1368
|
+
func withAPlayIntent_loadsOnce_fromTheStart() throws {
|
|
1369
|
+
let (c, eh) = try failedPlayer()
|
|
1370
|
+
let resolvesBefore = eh.resolveAndLoadCalls.count
|
|
1371
|
+
|
|
1372
|
+
try c.skipTo(0, playWhenReady: true)
|
|
1373
|
+
|
|
1374
|
+
#expect(eh.resolveAndLoadCalls.count == resolvesBefore + 1)
|
|
1375
|
+
#expect(c.playWhenReady)
|
|
1376
|
+
#expect((c.deferredSeek.target ?? 0) == 0)
|
|
1377
|
+
}
|
|
1378
|
+
|
|
1379
|
+
@Test @MainActor
|
|
1380
|
+
func startsFromTheRequestedPosition() throws {
|
|
1381
|
+
let (c, _) = try failedPlayer()
|
|
1382
|
+
|
|
1383
|
+
// What the bridge's `skip(index, initialPosition)` does.
|
|
1384
|
+
try c.skipTo(0)
|
|
1385
|
+
c.seek(to: 7)
|
|
1386
|
+
|
|
1387
|
+
#expect(c.state == .loading)
|
|
1388
|
+
#expect(c.deferredSeek.target == 7)
|
|
1389
|
+
}
|
|
1390
|
+
}
|
|
1391
|
+
|
|
1338
1392
|
// MARK: - Load
|
|
1339
1393
|
|
|
1340
1394
|
@Suite("Player - Load")
|
|
@@ -9,6 +9,111 @@ private func tracks(_ ids: String...) -> [Track] {
|
|
|
9
9
|
ids.map { Track(id: $0) }
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
+
// MARK: - upNextIndices
|
|
13
|
+
|
|
14
|
+
@Suite("upNextIndices")
|
|
15
|
+
@MainActor
|
|
16
|
+
struct UpNextIndicesTests {
|
|
17
|
+
@Test func sequential_listsTheTracksAfterTheCurrentOne_withoutIt() {
|
|
18
|
+
let q = QueueManager()
|
|
19
|
+
q.setQueue(tracks("a", "b", "c", "d"), initialIndex: 1)
|
|
20
|
+
q.repeatMode = .off
|
|
21
|
+
#expect(q.upNextIndices == [2, 3])
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
@Test func sequential_lastTrack_repeatOff_isEmpty() {
|
|
25
|
+
let q = QueueManager()
|
|
26
|
+
q.setQueue(tracks("a", "b", "c"), initialIndex: 2)
|
|
27
|
+
q.repeatMode = .off
|
|
28
|
+
#expect(q.upNextIndices.isEmpty)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
@Test func sequential_repeatQueue_wrapsToTheTracksBeforeTheCurrentOne() {
|
|
32
|
+
let q = QueueManager()
|
|
33
|
+
q.setQueue(tracks("a", "b", "c", "d"), initialIndex: 2)
|
|
34
|
+
q.repeatMode = .queue
|
|
35
|
+
#expect(q.upNextIndices == [3, 0, 1])
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
@Test func repeatTrack_listsWhatNextGoesTo() {
|
|
39
|
+
let q = QueueManager()
|
|
40
|
+
q.setQueue(tracks("a", "b", "c"), initialIndex: 1)
|
|
41
|
+
q.repeatMode = .track
|
|
42
|
+
#expect(q.upNextIndices == [2])
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
@Test func singleTrack_isEmpty_whateverTheRepeatMode() {
|
|
46
|
+
let q = QueueManager()
|
|
47
|
+
q.setQueue(tracks("a"))
|
|
48
|
+
for mode in [RepeatMode.off, .track, .queue] {
|
|
49
|
+
q.repeatMode = mode
|
|
50
|
+
#expect(q.upNextIndices.isEmpty)
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
@Test func emptyQueue_isEmpty() {
|
|
55
|
+
#expect(QueueManager().upNextIndices.isEmpty)
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
@Test func shuffle_followsTheOrderNextWalks() {
|
|
59
|
+
let q = QueueManager()
|
|
60
|
+
q.setQueue(tracks("a", "b", "c", "d", "e"), initialIndex: 2)
|
|
61
|
+
q.shuffleEnabled = true
|
|
62
|
+
let upNext = q.upNextIndices
|
|
63
|
+
var walked: [Int] = []
|
|
64
|
+
for _ in 0 ..< 4 {
|
|
65
|
+
_ = q.next()
|
|
66
|
+
walked.append(q.currentIndex)
|
|
67
|
+
}
|
|
68
|
+
#expect(upNext == walked)
|
|
69
|
+
#expect(!upNext.contains(2))
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
@Test func shuffle_fromTheMiddleOfTheOrder_stopsAtItsEndAsNextDoes() {
|
|
73
|
+
let q = QueueManager()
|
|
74
|
+
q.setQueue(tracks("a", "b", "c", "d", "e"))
|
|
75
|
+
q.shuffleEnabled = true
|
|
76
|
+
for _ in 0 ..< 2 {
|
|
77
|
+
_ = q.next()
|
|
78
|
+
}
|
|
79
|
+
let upNext = q.upNextIndices
|
|
80
|
+
var walked: [Int] = []
|
|
81
|
+
for _ in 0 ..< q.tracks.count where q.next() == .trackChanged {
|
|
82
|
+
walked.append(q.currentIndex)
|
|
83
|
+
}
|
|
84
|
+
#expect(upNext == walked)
|
|
85
|
+
#expect(upNext.count == 2)
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
@Test func shuffle_fromTheMiddleOfTheOrder_wrapsAsNextDoes() {
|
|
89
|
+
let q = QueueManager()
|
|
90
|
+
q.setQueue(tracks("a", "b", "c", "d", "e"))
|
|
91
|
+
q.repeatMode = .queue
|
|
92
|
+
q.shuffleEnabled = true
|
|
93
|
+
for _ in 0 ..< 2 {
|
|
94
|
+
_ = q.next()
|
|
95
|
+
}
|
|
96
|
+
let current = q.currentIndex
|
|
97
|
+
let upNext = q.upNextIndices
|
|
98
|
+
var walked: [Int] = []
|
|
99
|
+
for _ in 0 ..< 4 {
|
|
100
|
+
_ = q.next()
|
|
101
|
+
walked.append(q.currentIndex)
|
|
102
|
+
}
|
|
103
|
+
#expect(upNext == walked)
|
|
104
|
+
#expect(!upNext.contains(current))
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
@Test func followsTheCurrentTrack() {
|
|
108
|
+
let q = QueueManager()
|
|
109
|
+
q.setQueue(tracks("a", "b", "c"))
|
|
110
|
+
q.repeatMode = .queue
|
|
111
|
+
#expect(q.upNextIndices == [1, 2])
|
|
112
|
+
_ = q.next()
|
|
113
|
+
#expect(q.upNextIndices == [2, 0])
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
|
|
12
117
|
// MARK: - Navigation: next()
|
|
13
118
|
|
|
14
119
|
@Suite("next()")
|
|
@@ -74,8 +179,7 @@ struct NextTests {
|
|
|
74
179
|
|
|
75
180
|
#expect(q.shuffleOrder.isFirst(start))
|
|
76
181
|
#expect(!q.isLastInPlaybackOrder)
|
|
77
|
-
#expect(q.
|
|
78
|
-
#expect(q.previousTracks.isEmpty)
|
|
182
|
+
#expect(q.upNextIndices.count == 5)
|
|
79
183
|
}
|
|
80
184
|
}
|
|
81
185
|
|
|
@@ -91,7 +195,7 @@ struct NextTests {
|
|
|
91
195
|
|
|
92
196
|
#expect(q.shuffleOrder.isFirst(start))
|
|
93
197
|
#expect(!q.isLastInPlaybackOrder)
|
|
94
|
-
#expect(q.
|
|
198
|
+
#expect(q.upNextIndices.count == 5)
|
|
95
199
|
}
|
|
96
200
|
}
|
|
97
201
|
|
|
@@ -137,7 +241,7 @@ struct NextTests {
|
|
|
137
241
|
|
|
138
242
|
#expect(q.currentTrack?.id == "a")
|
|
139
243
|
#expect(!q.isLastInPlaybackOrder)
|
|
140
|
-
#expect(q.
|
|
244
|
+
#expect(q.upNextIndices.count == 5)
|
|
141
245
|
}
|
|
142
246
|
}
|
|
143
247
|
|
|
@@ -420,8 +524,7 @@ struct AddTests {
|
|
|
420
524
|
|
|
421
525
|
#expect(q.shuffleOrder.isFirst(start))
|
|
422
526
|
#expect(!q.isLastInPlaybackOrder)
|
|
423
|
-
#expect(q.
|
|
424
|
-
#expect(q.previousTracks.isEmpty)
|
|
527
|
+
#expect(q.upNextIndices.count == 5)
|
|
425
528
|
}
|
|
426
529
|
}
|
|
427
530
|
}
|
|
@@ -464,8 +567,7 @@ struct AddAtTests {
|
|
|
464
567
|
|
|
465
568
|
#expect(q.shuffleOrder.isFirst(0))
|
|
466
569
|
#expect(!q.isLastInPlaybackOrder)
|
|
467
|
-
#expect(q.
|
|
468
|
-
#expect(q.previousTracks.isEmpty)
|
|
570
|
+
#expect(q.upNextIndices.count == 5)
|
|
469
571
|
}
|
|
470
572
|
|
|
471
573
|
@Test func invalidIndex_throws() {
|
|
@@ -828,36 +930,6 @@ struct ComputedPropertyTests {
|
|
|
828
930
|
#expect(q.currentTrack == nil)
|
|
829
931
|
}
|
|
830
932
|
|
|
831
|
-
@Test func nextTracks_sequential() {
|
|
832
|
-
let q = QueueManager()
|
|
833
|
-
q.setQueue(tracks("a", "b", "c", "d"), initialIndex: 1)
|
|
834
|
-
let next = q.nextTracks
|
|
835
|
-
#expect(next.count == 2)
|
|
836
|
-
#expect(next[0].id == "c")
|
|
837
|
-
#expect(next[1].id == "d")
|
|
838
|
-
}
|
|
839
|
-
|
|
840
|
-
@Test func nextTracks_atEnd_isEmpty() {
|
|
841
|
-
let q = QueueManager()
|
|
842
|
-
q.setQueue(tracks("a", "b"), initialIndex: 1)
|
|
843
|
-
#expect(q.nextTracks.isEmpty)
|
|
844
|
-
}
|
|
845
|
-
|
|
846
|
-
@Test func previousTracks_sequential() {
|
|
847
|
-
let q = QueueManager()
|
|
848
|
-
q.setQueue(tracks("a", "b", "c", "d"), initialIndex: 2)
|
|
849
|
-
let prev = q.previousTracks
|
|
850
|
-
#expect(prev.count == 2)
|
|
851
|
-
#expect(prev[0].id == "a")
|
|
852
|
-
#expect(prev[1].id == "b")
|
|
853
|
-
}
|
|
854
|
-
|
|
855
|
-
@Test func previousTracks_atStart_isEmpty() {
|
|
856
|
-
let q = QueueManager()
|
|
857
|
-
q.setQueue(tracks("a", "b"))
|
|
858
|
-
#expect(q.previousTracks.isEmpty)
|
|
859
|
-
}
|
|
860
|
-
|
|
861
933
|
@Test func isLastInPlaybackOrder_sequential() {
|
|
862
934
|
let q = QueueManager()
|
|
863
935
|
q.setQueue(tracks("a", "b", "c"))
|
|
@@ -866,50 +938,11 @@ struct ComputedPropertyTests {
|
|
|
866
938
|
#expect(q.isLastInPlaybackOrder == true)
|
|
867
939
|
}
|
|
868
940
|
|
|
869
|
-
@Test func nextTracks_shuffle_matchesNavigation() {
|
|
870
|
-
let q = QueueManager()
|
|
871
|
-
q.setQueue(tracks("a", "b", "c", "d"))
|
|
872
|
-
q.shuffleEnabled = true
|
|
873
|
-
let nextFromProp = q.nextTracks.map { $0.id! }
|
|
874
|
-
var nextFromNav: [String] = []
|
|
875
|
-
for _ in 0 ..< nextFromProp.count {
|
|
876
|
-
_ = q.next()
|
|
877
|
-
nextFromNav.append(q.currentTrack!.id!)
|
|
878
|
-
}
|
|
879
|
-
#expect(nextFromProp == nextFromNav)
|
|
880
|
-
}
|
|
881
|
-
|
|
882
|
-
@Test func previousTracks_shuffle_matchesNavigation() {
|
|
883
|
-
let q = QueueManager()
|
|
884
|
-
q.setQueue(tracks("a", "b", "c", "d"))
|
|
885
|
-
q.shuffleEnabled = true
|
|
886
|
-
for _ in 0 ..< 3 {
|
|
887
|
-
_ = q.next()
|
|
888
|
-
}
|
|
889
|
-
let prevFromProp = q.previousTracks.map { $0.id! }
|
|
890
|
-
var prevFromNav: [String] = []
|
|
891
|
-
for _ in 0 ..< prevFromProp.count {
|
|
892
|
-
_ = q.previous()
|
|
893
|
-
prevFromNav.insert(q.currentTrack!.id!, at: 0)
|
|
894
|
-
}
|
|
895
|
-
#expect(prevFromProp == prevFromNav)
|
|
896
|
-
}
|
|
897
|
-
|
|
898
|
-
@Test func nextTracks_emptyQueue_isEmpty() {
|
|
899
|
-
let q = QueueManager()
|
|
900
|
-
#expect(q.nextTracks.isEmpty)
|
|
901
|
-
}
|
|
902
|
-
|
|
903
|
-
@Test func previousTracks_emptyQueue_isEmpty() {
|
|
904
|
-
let q = QueueManager()
|
|
905
|
-
#expect(q.previousTracks.isEmpty)
|
|
906
|
-
}
|
|
907
|
-
|
|
908
941
|
@Test func isLastInPlaybackOrder_shuffle() {
|
|
909
942
|
let q = QueueManager()
|
|
910
943
|
q.setQueue(tracks("a", "b", "c"))
|
|
911
944
|
q.shuffleEnabled = true
|
|
912
|
-
while !q.
|
|
945
|
+
while !q.upNextIndices.isEmpty {
|
|
913
946
|
_ = q.next()
|
|
914
947
|
}
|
|
915
948
|
#expect(q.isLastInPlaybackOrder == true)
|
|
@@ -118,6 +118,17 @@ struct RequestLayerTests {
|
|
|
118
118
|
#expect(RequestLayer.buildUrl(Config(path: "/a", baseUrl: "https://host", query: ["q": "x"])) == "https://host/a?q=x")
|
|
119
119
|
}
|
|
120
120
|
|
|
121
|
+
@Test func buildUrlLeavesQueryOffDataUrl() {
|
|
122
|
+
let dataUrl = "data:image/png;base64,iVBORw0KGgo="
|
|
123
|
+
#expect(RequestLayer.buildUrl(Config(path: dataUrl, baseUrl: "https://host", query: ["w": "512"])) == dataUrl)
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
@Test func buildUrlLeavesFileSrcOutOfSharedBaseUrl() {
|
|
127
|
+
let file = "file:///var/mobile/Containers/Data/Application/x/Documents/a.mp3"
|
|
128
|
+
let merged = RequestLayer.merge(Config.base(path: file), Config(baseUrl: "https://api.example.com"))
|
|
129
|
+
#expect(RequestLayer.buildUrl(merged) == file)
|
|
130
|
+
}
|
|
131
|
+
|
|
121
132
|
@Test func mergeDictsIsNilSafe() {
|
|
122
133
|
#expect(RequestLayer.mergeDicts(nil, nil) == nil)
|
|
123
134
|
#expect(RequestLayer.mergeDicts(["a": "1"], nil) == ["a": "1"])
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import CoreGraphics
|
|
2
|
+
import Testing
|
|
3
|
+
|
|
4
|
+
@testable import AudioBrowserTestable
|
|
5
|
+
|
|
6
|
+
@Suite("RoutePickerSourceFrame")
|
|
7
|
+
struct RoutePickerSourceFrameTests {
|
|
8
|
+
@Test("without an anchor the source is 1x1 at the window's top-left corner")
|
|
9
|
+
func noAnchor() {
|
|
10
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: nil) == CGRect(x: 0, y: 0, width: 1, height: 1))
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
@Test("the source takes the anchor's whole rect")
|
|
14
|
+
func followsAnchor() {
|
|
15
|
+
let anchor = CGRect(x: 16, y: 520, width: 358, height: 44)
|
|
16
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: anchor) == anchor)
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
@Test("an anchor with no area still gives the source 1x1 at its origin")
|
|
20
|
+
func emptyAnchor() {
|
|
21
|
+
let anchor = CGRect(x: 40, y: 300, width: 0, height: 0)
|
|
22
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: anchor) == CGRect(x: 40, y: 300, width: 1, height: 1))
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
@Test("an anchor with a negative size is read as the rect it covers")
|
|
26
|
+
func negativeSize() {
|
|
27
|
+
let anchor = CGRect(x: 100, y: 200, width: -50, height: -20)
|
|
28
|
+
#expect(RoutePickerSourceFrame.inWindow(anchor: anchor) == CGRect(x: 50, y: 180, width: 50, height: 20))
|
|
29
|
+
}
|
|
30
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import Testing
|
|
2
|
+
|
|
3
|
+
@testable import AudioBrowserTestable
|
|
4
|
+
|
|
5
|
+
@MainActor
|
|
6
|
+
@Suite("RoutePickerSourceLifetime")
|
|
7
|
+
struct RoutePickerSourceLifetimeTests {
|
|
8
|
+
final class Source {}
|
|
9
|
+
|
|
10
|
+
@MainActor
|
|
11
|
+
final class Removals {
|
|
12
|
+
var removed: [ObjectIdentifier] = []
|
|
13
|
+
lazy var lifetime = RoutePickerSourceLifetime<Source> { [unowned self] in
|
|
14
|
+
removed.append(ObjectIdentifier($0))
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
func wasRemoved(_ source: Source) -> Bool {
|
|
18
|
+
removed.contains(ObjectIdentifier(source))
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
@Test("a source stays while its picker shows past the settle time")
|
|
23
|
+
func staysWhilePresenting() {
|
|
24
|
+
let removals = Removals()
|
|
25
|
+
let source = Source()
|
|
26
|
+
removals.lifetime.added(source)
|
|
27
|
+
removals.lifetime.willBeginPresenting(source)
|
|
28
|
+
removals.lifetime.settled(source)
|
|
29
|
+
#expect(!removals.wasRemoved(source))
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
@Test("a source goes when its picker ends")
|
|
33
|
+
func goesWhenPickerEnds() {
|
|
34
|
+
let removals = Removals()
|
|
35
|
+
let source = Source()
|
|
36
|
+
removals.lifetime.added(source)
|
|
37
|
+
removals.lifetime.willBeginPresenting(source)
|
|
38
|
+
removals.lifetime.settled(source)
|
|
39
|
+
removals.lifetime.didEndPresenting(source)
|
|
40
|
+
#expect(removals.wasRemoved(source))
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
@Test("a source whose picker never began goes when it settles")
|
|
44
|
+
func goesWhenNeverPresented() {
|
|
45
|
+
let removals = Removals()
|
|
46
|
+
let source = Source()
|
|
47
|
+
removals.lifetime.added(source)
|
|
48
|
+
removals.lifetime.settled(source)
|
|
49
|
+
#expect(removals.wasRemoved(source))
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
@Test("a picker that never ends keeps its source until the next is added")
|
|
53
|
+
func nextSourceReplacesOneThatNeverEnded() {
|
|
54
|
+
let removals = Removals()
|
|
55
|
+
let first = Source()
|
|
56
|
+
removals.lifetime.added(first)
|
|
57
|
+
removals.lifetime.willBeginPresenting(first)
|
|
58
|
+
removals.lifetime.settled(first)
|
|
59
|
+
#expect(!removals.wasRemoved(first))
|
|
60
|
+
|
|
61
|
+
let second = Source()
|
|
62
|
+
removals.lifetime.added(second)
|
|
63
|
+
#expect(removals.wasRemoved(first))
|
|
64
|
+
#expect(!removals.wasRemoved(second))
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
@Test("an earlier picker ending leaves the showing one's source")
|
|
68
|
+
func earlierEndLeavesCurrentPresenting() {
|
|
69
|
+
let removals = Removals()
|
|
70
|
+
let first = Source()
|
|
71
|
+
let second = Source()
|
|
72
|
+
removals.lifetime.added(first)
|
|
73
|
+
removals.lifetime.added(second)
|
|
74
|
+
removals.lifetime.willBeginPresenting(second)
|
|
75
|
+
removals.lifetime.didEndPresenting(first)
|
|
76
|
+
removals.lifetime.settled(second)
|
|
77
|
+
#expect(!removals.wasRemoved(second))
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -82,4 +82,17 @@ struct SectionPresentationTests {
|
|
|
82
82
|
#expect(SectionPresentation.effectiveAccessorySymbol(TrackStyle()) == nil)
|
|
83
83
|
#expect(SectionPresentation.effectiveAccessorySymbol(nil) == nil)
|
|
84
84
|
}
|
|
85
|
+
|
|
86
|
+
@Test func tappedTile_selectsAnEnabledTrackInRange() {
|
|
87
|
+
let tiles = [Track(id: "a"), Track(id: "b", disabled: true)]
|
|
88
|
+
#expect(SectionPresentation.tappedTile(at: 0, in: tiles)?.id == "a")
|
|
89
|
+
#expect(SectionPresentation.tappedTile(at: 1, in: tiles) == nil)
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
@Test func tappedTile_outsideTheTracks_selectsNothing() {
|
|
93
|
+
let tiles = [Track(id: "a")]
|
|
94
|
+
#expect(SectionPresentation.tappedTile(at: -1, in: tiles) == nil)
|
|
95
|
+
#expect(SectionPresentation.tappedTile(at: 1, in: tiles) == nil)
|
|
96
|
+
#expect(SectionPresentation.tappedTile(at: 0, in: []) == nil)
|
|
97
|
+
}
|
|
85
98
|
}
|
|
@@ -30,7 +30,13 @@ func makeMetadataItem(
|
|
|
30
30
|
final class MockPlayerEngine: PlayerEngine {
|
|
31
31
|
var onEvent: (@MainActor (EngineEvent) -> Void)?
|
|
32
32
|
|
|
33
|
+
/// As AVPlayerEngine: a prepared item is in the player before its event goes out.
|
|
33
34
|
func emit(_ event: EngineEvent) {
|
|
35
|
+
if case .itemPrepared = event {
|
|
36
|
+
hasItem = true
|
|
37
|
+
hasLoadedAsset = true
|
|
38
|
+
itemIsCarrier = false
|
|
39
|
+
}
|
|
34
40
|
onEvent?(event)
|
|
35
41
|
}
|
|
36
42
|
|
|
@@ -49,16 +55,22 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
49
55
|
|
|
50
56
|
var resolveAndLoadCalls: [String] = []
|
|
51
57
|
var shortStartBufferRequests: [Bool] = []
|
|
58
|
+
var itemIsCarrier = false
|
|
59
|
+
var carrierAtLoad: [Bool] = []
|
|
52
60
|
var cancelLoadingCount = 0
|
|
53
61
|
var dropAssetCount = 0
|
|
54
62
|
var clearItemCount = 0
|
|
55
63
|
var carrierCount = 0
|
|
56
64
|
var stopObservingItemCount = 0
|
|
57
65
|
var recreateCount = 0
|
|
66
|
+
enum ItemCall { case pause, carrier }
|
|
67
|
+
/// Pauses and carrier swaps, in the order the Player called them.
|
|
68
|
+
var pauseAndCarrierOrder: [ItemCall] = []
|
|
58
69
|
|
|
59
70
|
func resolveAndLoad(src: String, track _: Track, shortStartBuffer: Bool) {
|
|
60
71
|
resolveAndLoadCalls.append(src)
|
|
61
72
|
shortStartBufferRequests.append(shortStartBuffer)
|
|
73
|
+
carrierAtLoad.append(itemIsCarrier)
|
|
62
74
|
}
|
|
63
75
|
|
|
64
76
|
func cancelLoading() { cancelLoadingCount += 1 }
|
|
@@ -70,15 +82,21 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
70
82
|
func clearItem() {
|
|
71
83
|
clearItemCount += 1
|
|
72
84
|
hasItem = false
|
|
85
|
+
itemIsCarrier = false
|
|
73
86
|
hasLoadedAsset = false
|
|
74
87
|
resumePosition = nil
|
|
75
88
|
}
|
|
76
89
|
|
|
77
90
|
func replaceItemWithNowPlayingCarrier() {
|
|
78
91
|
carrierCount += 1
|
|
92
|
+
pauseAndCarrierOrder.append(.carrier)
|
|
79
93
|
hasItem = true
|
|
94
|
+
itemIsCarrier = true
|
|
80
95
|
hasLoadedAsset = false
|
|
81
96
|
resumePosition = nil
|
|
97
|
+
currentTime = 0
|
|
98
|
+
duration = 0
|
|
99
|
+
bufferedPosition = 0
|
|
82
100
|
liveEdge = nil
|
|
83
101
|
liveWindowSeconds = nil
|
|
84
102
|
}
|
|
@@ -100,7 +118,11 @@ final class MockPlayerEngine: PlayerEngine {
|
|
|
100
118
|
func play() { startPlaybackCallCount += 1 }
|
|
101
119
|
var forwardBufferCaps: [Double?] = []
|
|
102
120
|
func capForwardBuffer(_ seconds: Double?) { forwardBufferCaps.append(seconds) }
|
|
103
|
-
func pause() {
|
|
121
|
+
func pause() {
|
|
122
|
+
pausePlaybackCallCount += 1
|
|
123
|
+
pauseAndCarrierOrder.append(.pause)
|
|
124
|
+
}
|
|
125
|
+
|
|
104
126
|
func setRate(_ rate: Float, playing: Bool) { rates.append((rate, playing)) }
|
|
105
127
|
private var seeksInFlight: [@MainActor (Bool) -> Void] = []
|
|
106
128
|
|
|
@@ -47,6 +47,29 @@ enum ArtworkImageFetcher {
|
|
|
47
47
|
processor = nil
|
|
48
48
|
}
|
|
49
49
|
if let processor { options.append(.processor(processor)) }
|
|
50
|
+
|
|
51
|
+
let result: Result<UIImage, any Error> = if url.scheme?.lowercased() == "data" {
|
|
52
|
+
await retrieve(.provider(DataURLProvider(url: url)), options: options + [.cacheMemoryOnly], freshnessKey: nil)
|
|
53
|
+
} else {
|
|
54
|
+
await fetch(url, options: options, processor: processor, waitsForConnectivity: waitsForConnectivity)
|
|
55
|
+
}
|
|
56
|
+
switch result {
|
|
57
|
+
case let .success(image):
|
|
58
|
+
return image
|
|
59
|
+
case let .failure(error):
|
|
60
|
+
logger.error("Failed to load artwork from \(source.uri.prefix(200)): \(error.localizedDescription)")
|
|
61
|
+
return nil
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/// Fetches `url` from the cache while its HTTP freshness lasts, else past the cache.
|
|
66
|
+
@MainActor
|
|
67
|
+
private static func fetch(
|
|
68
|
+
_ url: URL,
|
|
69
|
+
options: KingfisherOptionsInfo,
|
|
70
|
+
processor: (any ImageProcessor)?,
|
|
71
|
+
waitsForConnectivity: Bool,
|
|
72
|
+
) async -> Result<UIImage, any Error> {
|
|
50
73
|
let retry: KingfisherOptionsInfo = waitsForConnectivity ? [.retryStrategy(ConnectivityRetry())] : []
|
|
51
74
|
|
|
52
75
|
// Each processed variant is fresh on its own: a variant cached before the image changed
|
|
@@ -54,18 +77,11 @@ enum ArtworkImageFetcher {
|
|
|
54
77
|
let key = url.absoluteString + (processor?.identifier ?? "")
|
|
55
78
|
// Only HTTP fetches record a lifetime, so any other scheme would otherwise refetch on every call.
|
|
56
79
|
let isFresh = if ["http", "https"].contains(url.scheme?.lowercased()) { await freshness.isFresh(key) } else { true }
|
|
57
|
-
|
|
58
|
-
await retrieve(url, options: options + retry, freshnessKey: key)
|
|
80
|
+
return if isFresh {
|
|
81
|
+
await retrieve(.network(url), options: options + retry, freshnessKey: key)
|
|
59
82
|
} else {
|
|
60
83
|
await refetch(url, options: options, retry: retry, freshnessKey: key)
|
|
61
84
|
}
|
|
62
|
-
switch result {
|
|
63
|
-
case let .success(image):
|
|
64
|
-
return image
|
|
65
|
-
case let .failure(error):
|
|
66
|
-
logger.error("Failed to load artwork from \(source.uri): \(error.localizedDescription)")
|
|
67
|
-
return nil
|
|
68
|
-
}
|
|
69
85
|
}
|
|
70
86
|
|
|
71
87
|
private static let freshness = FreshnessStore()
|
|
@@ -80,26 +96,26 @@ enum ArtworkImageFetcher {
|
|
|
80
96
|
retry: KingfisherOptionsInfo,
|
|
81
97
|
freshnessKey: String,
|
|
82
98
|
) async -> Result<UIImage, any Error> {
|
|
83
|
-
let fetched = await retrieve(url, options: options + [.forceRefresh], freshnessKey: freshnessKey)
|
|
99
|
+
let fetched = await retrieve(.network(url), options: options + [.forceRefresh], freshnessKey: freshnessKey)
|
|
84
100
|
guard case let .failure(error) = fetched else { return fetched }
|
|
85
101
|
if let cached = try? await KingfisherManager.shared.retrieveImage(with: url, options: options + [.onlyFromCache]) {
|
|
86
102
|
return .success(cached.image)
|
|
87
103
|
}
|
|
88
104
|
guard !retry.isEmpty, (error as? KingfisherError)?.isConnectivity == true else { return fetched }
|
|
89
|
-
return await retrieve(url, options: options + [.forceRefresh] + retry, freshnessKey: freshnessKey)
|
|
105
|
+
return await retrieve(.network(url), options: options + [.forceRefresh] + retry, freshnessKey: freshnessKey)
|
|
90
106
|
}
|
|
91
107
|
|
|
92
|
-
/// Fetches through Kingfisher and records the freshness lifetime of an image that was downloaded.
|
|
108
|
+
/// Fetches through Kingfisher and, given a `freshnessKey`, records the freshness lifetime of an image that was downloaded.
|
|
93
109
|
@MainActor
|
|
94
110
|
private static func retrieve(
|
|
95
|
-
_
|
|
111
|
+
_ source: Source,
|
|
96
112
|
options: KingfisherOptionsInfo,
|
|
97
|
-
freshnessKey: String
|
|
113
|
+
freshnessKey: String?,
|
|
98
114
|
) async -> Result<UIImage, any Error> {
|
|
99
115
|
do {
|
|
100
|
-
let result = try await KingfisherManager.shared.retrieveImage(with:
|
|
116
|
+
let result = try await KingfisherManager.shared.retrieveImage(with: source, options: options)
|
|
101
117
|
// `.none` also covers an image re-processed from the cached original; only metrics mark a download.
|
|
102
|
-
if result.cacheType == .none, let metrics = result.metrics {
|
|
118
|
+
if let freshnessKey, result.cacheType == .none, let metrics = result.metrics {
|
|
103
119
|
let responses = metrics.rawMetrics.transactionMetrics.compactMap { $0.response as? HTTPURLResponse }
|
|
104
120
|
await freshness.record(freshnessKey, lifetime: ArtworkFreshness.lifetime(of: responses))
|
|
105
121
|
}
|
|
@@ -110,6 +126,14 @@ enum ArtworkImageFetcher {
|
|
|
110
126
|
}
|
|
111
127
|
}
|
|
112
128
|
|
|
129
|
+
/// A data: URL's bytes: Kingfisher's downloader fails any response that is not an HTTPURLResponse,
|
|
130
|
+
/// and a data: URL's is not.
|
|
131
|
+
private struct DataURLProvider: ImageDataProvider {
|
|
132
|
+
let url: URL
|
|
133
|
+
var cacheKey: String { url.absoluteString }
|
|
134
|
+
func data() async throws -> Data { try Data(contentsOf: url) }
|
|
135
|
+
}
|
|
136
|
+
|
|
113
137
|
/// Cache keys whose image is still fresh, each stored on disk with its lifetime as expiry.
|
|
114
138
|
private actor FreshnessStore {
|
|
115
139
|
private let storage = try? DiskStorage.Backend<Data>(
|
|
@@ -13,8 +13,12 @@ typealias CallbackSubscription<T> = (_ deliver: @escaping @Sendable (Result<T, E
|
|
|
13
13
|
|
|
14
14
|
/// The result `subscribe` delivers. Unlike Nitro's `Promise.await`, a cancelled caller throws
|
|
15
15
|
/// `CancellationError` at once, and with a `timeout`, a silent callback throws
|
|
16
|
-
/// `CallbackTimeoutError` once it elapses.
|
|
17
|
-
|
|
16
|
+
/// `CallbackTimeoutError` once it elapses. `subscribe` runs on the caller's actor.
|
|
17
|
+
func awaitCallback<T>(
|
|
18
|
+
timeout: Duration? = nil,
|
|
19
|
+
isolation: isolated (any Actor)? = #isolation,
|
|
20
|
+
_ subscribe: CallbackSubscription<T>,
|
|
21
|
+
) async throws -> T {
|
|
18
22
|
let once = ResumeOnce<T>()
|
|
19
23
|
let timer = timeout.map { timeout in
|
|
20
24
|
Task {
|
|
@@ -23,14 +27,16 @@ nonisolated(nonsending) func awaitCallback<T>(timeout: Duration? = nil, _ subscr
|
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
defer { timer?.cancel() }
|
|
26
|
-
return try await withTaskCancellationHandler
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
return try await withTaskCancellationHandler(
|
|
31
|
+
operation: {
|
|
32
|
+
try await withCheckedThrowingContinuation(isolation: isolation) { continuation in
|
|
33
|
+
once.start(continuation)
|
|
34
|
+
subscribe { once.resume($0) }
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
onCancel: { once.resume(.failure(CancellationError())) },
|
|
38
|
+
isolation: isolation,
|
|
39
|
+
)
|
|
34
40
|
}
|
|
35
41
|
|
|
36
42
|
/// Resumes its continuation with the first result only, whichever thread sends it and whether it
|