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
|
@@ -13,13 +13,34 @@ private final class BrowserMock: TrackSelectionBrowser {
|
|
|
13
13
|
var trackLoadEvents: [TrackLoadEvent] = []
|
|
14
14
|
var expandedPaths: [String] = []
|
|
15
15
|
|
|
16
|
+
/// Expansions of these paths, and track-load handlers for these track ids, answer only after
|
|
17
|
+
/// `release()`.
|
|
18
|
+
var held: Set<String> = []
|
|
19
|
+
private(set) var waiting: [CheckedContinuation<Void, Never>] = []
|
|
20
|
+
|
|
21
|
+
func release() {
|
|
22
|
+
let resuming = waiting
|
|
23
|
+
waiting = []
|
|
24
|
+
held = []
|
|
25
|
+
for continuation in resuming {
|
|
26
|
+
continuation.resume()
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
private func hold(_ key: String?) async {
|
|
31
|
+
guard let key, held.contains(key) else { return }
|
|
32
|
+
await withCheckedContinuation { waiting.append($0) }
|
|
33
|
+
}
|
|
34
|
+
|
|
16
35
|
func awaitTrackLoadHandler(event: TrackLoadEvent) async -> Bool {
|
|
17
36
|
trackLoadEvents.append(event)
|
|
37
|
+
await hold(event.track.id)
|
|
18
38
|
return trackLoadHandlerResult
|
|
19
39
|
}
|
|
20
40
|
|
|
21
41
|
func expandQueueFromContextualPath(_ path: String) async throws -> (tracks: [Track], selectedIndex: Int)? {
|
|
22
42
|
expandedPaths.append(path)
|
|
43
|
+
await hold(path)
|
|
23
44
|
if let error = expandQueueError {
|
|
24
45
|
throw error
|
|
25
46
|
}
|
|
@@ -47,6 +68,14 @@ private func makeSelector() -> (TrackSelector, BrowserMock, PlayerMock) {
|
|
|
47
68
|
return (selector, browser, player)
|
|
48
69
|
}
|
|
49
70
|
|
|
71
|
+
@MainActor
|
|
72
|
+
private func yieldUntil(_ condition: () -> Bool, sourceLocation: SourceLocation = #_sourceLocation) async {
|
|
73
|
+
for _ in 0 ..< 1000 where !condition() {
|
|
74
|
+
await Task.yield()
|
|
75
|
+
}
|
|
76
|
+
#expect(condition(), sourceLocation: sourceLocation)
|
|
77
|
+
}
|
|
78
|
+
|
|
50
79
|
// MARK: - Browsable Track
|
|
51
80
|
|
|
52
81
|
@Suite("browsable track")
|
|
@@ -389,3 +418,128 @@ struct DisabledTrackTests {
|
|
|
389
418
|
#expect(browser.expandedPaths.isEmpty)
|
|
390
419
|
}
|
|
391
420
|
}
|
|
421
|
+
|
|
422
|
+
// MARK: - Selection Order
|
|
423
|
+
|
|
424
|
+
@Suite("selection order")
|
|
425
|
+
@MainActor
|
|
426
|
+
struct SelectionOrderTests {
|
|
427
|
+
/// A selection running beside the test, and its result once it has one.
|
|
428
|
+
@MainActor
|
|
429
|
+
private final class PendingSelection {
|
|
430
|
+
private var result: TrackSelector.SelectionResult?
|
|
431
|
+
|
|
432
|
+
init(_ selector: TrackSelector, _ track: Track, _ player: PlayerMock) {
|
|
433
|
+
Task { result = await selector.select(track: track, player: player) }
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
func value() async -> TrackSelector.SelectionResult? {
|
|
437
|
+
await yieldUntil { result != nil }
|
|
438
|
+
return result
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
|
|
442
|
+
/// Starts selecting a contextual track whose expansion stays held until `browser.release()`.
|
|
443
|
+
private func selectHeldInExpansion(
|
|
444
|
+
_ selector: TrackSelector, _ browser: BrowserMock, _ player: PlayerMock,
|
|
445
|
+
) async -> PendingSelection {
|
|
446
|
+
let path = BrowserPathHelper.build(parentPath: "/library/radio", trackId: "older")
|
|
447
|
+
browser.held = [path]
|
|
448
|
+
browser.expandQueueResult = (tracks: [Track(id: "older", src: "older.mp3")], selectedIndex: 0)
|
|
449
|
+
let selection = PendingSelection(selector, Track(id: "older", path: path, src: "older.mp3"), player)
|
|
450
|
+
await yieldUntil { browser.waiting.count == 1 }
|
|
451
|
+
return selection
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
@Test func olderExpansionFinishingLast_isSupersededAndNotOfferedToTheApp() async {
|
|
455
|
+
let (selector, browser, player) = makeSelector()
|
|
456
|
+
let older = await selectHeldInExpansion(selector, browser, player)
|
|
457
|
+
|
|
458
|
+
let newer = await selector.select(track: Track(id: "newer", src: "newer.mp3"), player: player)
|
|
459
|
+
guard case let .play(.loadTrack(loaded)) = newer else {
|
|
460
|
+
Issue.record("expected .play(.loadTrack), got \(newer)")
|
|
461
|
+
return
|
|
462
|
+
}
|
|
463
|
+
#expect(loaded.id == "newer")
|
|
464
|
+
|
|
465
|
+
browser.release()
|
|
466
|
+
let olderResult = await older.value()
|
|
467
|
+
guard case .superseded = olderResult else {
|
|
468
|
+
Issue.record("expected .superseded, got \(String(describing: olderResult))")
|
|
469
|
+
return
|
|
470
|
+
}
|
|
471
|
+
#expect(browser.trackLoadEvents.map(\.track.id) == ["newer"])
|
|
472
|
+
}
|
|
473
|
+
|
|
474
|
+
@Test func olderTrackLoadHandlerFinishingLast_isSuperseded() async {
|
|
475
|
+
let (selector, browser, player) = makeSelector()
|
|
476
|
+
browser.held = ["older"]
|
|
477
|
+
let older = PendingSelection(selector, Track(id: "older", src: "older.mp3"), player)
|
|
478
|
+
await yieldUntil { browser.waiting.count == 1 }
|
|
479
|
+
|
|
480
|
+
let newer = await selector.select(track: Track(id: "newer", src: "newer.mp3"), player: player)
|
|
481
|
+
guard case .play = newer else {
|
|
482
|
+
Issue.record("expected .play, got \(newer)")
|
|
483
|
+
return
|
|
484
|
+
}
|
|
485
|
+
|
|
486
|
+
browser.release()
|
|
487
|
+
let olderResult = await older.value()
|
|
488
|
+
guard case .superseded = olderResult else {
|
|
489
|
+
Issue.record("expected .superseded, got \(String(describing: olderResult))")
|
|
490
|
+
return
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
|
|
494
|
+
@Test func laterInterceptedSelection_supersedesTheOlderOne() async {
|
|
495
|
+
let (selector, browser, player) = makeSelector()
|
|
496
|
+
let older = await selectHeldInExpansion(selector, browser, player)
|
|
497
|
+
|
|
498
|
+
browser.trackLoadHandlerResult = true
|
|
499
|
+
let newer = await selector.select(track: Track(id: "newer", src: "newer.mp3"), player: player)
|
|
500
|
+
guard case .intercepted = newer else {
|
|
501
|
+
Issue.record("expected .intercepted, got \(newer)")
|
|
502
|
+
return
|
|
503
|
+
}
|
|
504
|
+
|
|
505
|
+
browser.release()
|
|
506
|
+
let olderResult = await older.value()
|
|
507
|
+
guard case .superseded = olderResult else {
|
|
508
|
+
Issue.record("expected .superseded, got \(String(describing: olderResult))")
|
|
509
|
+
return
|
|
510
|
+
}
|
|
511
|
+
#expect(browser.trackLoadEvents.map(\.track.id) == ["newer"])
|
|
512
|
+
}
|
|
513
|
+
|
|
514
|
+
@Test func laterBrowse_leavesTheOlderSelectionToPlay() async {
|
|
515
|
+
let (selector, browser, player) = makeSelector()
|
|
516
|
+
let older = await selectHeldInExpansion(selector, browser, player)
|
|
517
|
+
|
|
518
|
+
let browse = await selector.select(track: Track(id: "folder", path: "/library"), player: player)
|
|
519
|
+
guard case .browse = browse else {
|
|
520
|
+
Issue.record("expected .browse, got \(browse)")
|
|
521
|
+
return
|
|
522
|
+
}
|
|
523
|
+
|
|
524
|
+
browser.release()
|
|
525
|
+
let olderResult = await older.value()
|
|
526
|
+
guard case .play(.setQueue) = olderResult else {
|
|
527
|
+
Issue.record("expected .play(.setQueue), got \(String(describing: olderResult))")
|
|
528
|
+
return
|
|
529
|
+
}
|
|
530
|
+
}
|
|
531
|
+
|
|
532
|
+
@Test func laterDisabledTrack_leavesTheOlderSelectionToPlay() async {
|
|
533
|
+
let (selector, browser, player) = makeSelector()
|
|
534
|
+
let older = await selectHeldInExpansion(selector, browser, player)
|
|
535
|
+
|
|
536
|
+
_ = await selector.select(track: Track(id: "gone", src: "gone.mp3", disabled: true), player: player)
|
|
537
|
+
|
|
538
|
+
browser.release()
|
|
539
|
+
let olderResult = await older.value()
|
|
540
|
+
guard case .play(.setQueue) = olderResult else {
|
|
541
|
+
Issue.record("expected .play(.setQueue), got \(String(describing: olderResult))")
|
|
542
|
+
return
|
|
543
|
+
}
|
|
544
|
+
}
|
|
545
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
@testable import AudioBrowserTestable
|
|
2
|
+
import Foundation
|
|
3
|
+
import Testing
|
|
4
|
+
|
|
5
|
+
/// Answers every request from its own URL: the status is the path, the body the `body` query item.
|
|
6
|
+
private final class StubResponseProtocol: URLProtocol {
|
|
7
|
+
static func url(status: Int, body: String) -> String {
|
|
8
|
+
var components = URLComponents()
|
|
9
|
+
components.scheme = "https"
|
|
10
|
+
components.host = "stub.invalid"
|
|
11
|
+
components.path = "/\(status)"
|
|
12
|
+
components.queryItems = [URLQueryItem(name: "body", value: body)]
|
|
13
|
+
return components.string!
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
override class func canInit(with _: URLRequest) -> Bool {
|
|
17
|
+
true
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
override class func canonicalRequest(for request: URLRequest) -> URLRequest {
|
|
21
|
+
request
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
override func startLoading() {
|
|
25
|
+
let url = request.url!
|
|
26
|
+
let body = URLComponents(url: url, resolvingAgainstBaseURL: false)!.queryItems!.first { $0.name == "body" }!.value!
|
|
27
|
+
let response = HTTPURLResponse(
|
|
28
|
+
url: url, statusCode: Int(url.lastPathComponent)!, httpVersion: "HTTP/1.1", headerFields: nil,
|
|
29
|
+
)!
|
|
30
|
+
client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)
|
|
31
|
+
client?.urlProtocol(self, didLoad: Data(body.utf8))
|
|
32
|
+
client?.urlProtocolDidFinishLoading(self)
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
override func stopLoading() {}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
@Suite("A 2xx response that does not parse")
|
|
39
|
+
struct UnparsableResponseTests {
|
|
40
|
+
/// The navigation error of requesting `body`, served with `status`, as `type`.
|
|
41
|
+
private func navigationError(status: Int, body: String, as type: (some Decodable).Type) async -> NavigationError? {
|
|
42
|
+
let configuration = URLSessionConfiguration.ephemeral
|
|
43
|
+
configuration.protocolClasses = [StubResponseProtocol.self]
|
|
44
|
+
let request = HttpClient.HttpRequest(
|
|
45
|
+
url: StubResponseProtocol.url(status: status, body: body), method: .get, headers: nil, body: nil,
|
|
46
|
+
contentType: HttpClient.defaultContentType, userAgent: HttpClient.defaultUserAgent,
|
|
47
|
+
)
|
|
48
|
+
let session = URLSession(configuration: configuration)
|
|
49
|
+
defer { session.finishTasksAndInvalidate() }
|
|
50
|
+
do {
|
|
51
|
+
_ = try await HttpClient(session: session).requestJson(request, as: type)
|
|
52
|
+
return nil
|
|
53
|
+
} catch {
|
|
54
|
+
return NavigationError.from(error)
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
@Test(arguments: [
|
|
59
|
+
("<html><body>Maintenance</body></html>", "not valid JSON"),
|
|
60
|
+
(#"{"path": "/library"}"#, "Missing required key 'title'"),
|
|
61
|
+
(#"{"path": "/library", "title": "Library", "duration": "12"}"#, "Type mismatch for Double at path: duration"),
|
|
62
|
+
])
|
|
63
|
+
func aPageIsAnHttpErrorWithItsStatus(body: String, reason: String) async throws {
|
|
64
|
+
let result = await navigationError(status: 200, body: body, as: JsonBrowsePage.self)
|
|
65
|
+
let error = try #require(result)
|
|
66
|
+
|
|
67
|
+
#expect(error.code == .httpError)
|
|
68
|
+
#expect(error.statusCode == 200)
|
|
69
|
+
#expect(error.statusCodeSuccess == true)
|
|
70
|
+
#expect(error.message.contains(reason))
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
@Test
|
|
74
|
+
func searchResultsAreAnHttpErrorWithTheirStatus() async throws {
|
|
75
|
+
let result = await navigationError(status: 201, body: #"{"results": []}"#, as: [JsonTrack].self)
|
|
76
|
+
let error = try #require(result)
|
|
77
|
+
|
|
78
|
+
#expect(error.code == .httpError)
|
|
79
|
+
#expect(error.statusCode == 201)
|
|
80
|
+
#expect(error.statusCodeSuccess == true)
|
|
81
|
+
#expect(error.message.contains("Type mismatch"))
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
@Test
|
|
85
|
+
func itsDefaultTitleIsServerError() async throws {
|
|
86
|
+
let result = await navigationError(status: 200, body: "<html></html>", as: JsonResolvedTrack.self)
|
|
87
|
+
let error = try #require(result)
|
|
88
|
+
|
|
89
|
+
#expect(error.defaultFormatted().title == "Server Error")
|
|
90
|
+
}
|
|
91
|
+
}
|
package/ios/TrackSelector.swift
CHANGED
|
@@ -19,6 +19,9 @@ import os.log
|
|
|
19
19
|
class TrackSelector {
|
|
20
20
|
private let logger = Logger(subsystem: "com.audiobrowser", category: "TrackSelector")
|
|
21
21
|
private nonisolated(unsafe) let browserManager: any TrackSelectionBrowser
|
|
22
|
+
/// Bumped by every selection that would play, whether or not the app's `handleTrackLoad`
|
|
23
|
+
/// intercepts it; one that finds it bumped has been superseded.
|
|
24
|
+
private var latestSelection: UInt = 0
|
|
22
25
|
|
|
23
26
|
nonisolated init(browserManager: any TrackSelectionBrowser) {
|
|
24
27
|
self.browserManager = browserManager
|
|
@@ -32,6 +35,8 @@ class TrackSelector {
|
|
|
32
35
|
case intercepted
|
|
33
36
|
/// The track has no `src`; the caller navigates to `path`.
|
|
34
37
|
case browse(path: String)
|
|
38
|
+
/// A later selection began to play before this one resolved; the caller plays nothing.
|
|
39
|
+
case superseded
|
|
35
40
|
case none
|
|
36
41
|
}
|
|
37
42
|
|
|
@@ -47,6 +52,8 @@ class TrackSelector {
|
|
|
47
52
|
/// the current queue when it came from the same parent, else the parent expanded into a queue
|
|
48
53
|
/// (the track alone if expansion fails); a single track for a `src`; browse for a bare `path`.
|
|
49
54
|
/// A playback is first offered to the app's `handleTrackLoad`, which can intercept it.
|
|
55
|
+
/// Of the playbacks still resolving, only the latest plays, even when the app intercepts it:
|
|
56
|
+
/// an earlier one is `superseded`, and is not offered to the app once it is.
|
|
50
57
|
func select(
|
|
51
58
|
track: Track,
|
|
52
59
|
player: some TrackSelectionPlayer,
|
|
@@ -56,17 +63,20 @@ class TrackSelector {
|
|
|
56
63
|
return .none
|
|
57
64
|
}
|
|
58
65
|
|
|
59
|
-
let
|
|
60
|
-
if
|
|
61
|
-
|
|
62
|
-
} else if track.src != nil {
|
|
63
|
-
playback = .single(track)
|
|
64
|
-
} else if let path = track.path {
|
|
65
|
-
return .browse(path: path)
|
|
66
|
-
} else {
|
|
66
|
+
let contextualPath = track.path.flatMap { BrowserPathHelper.isContextual($0) ? $0 : nil }
|
|
67
|
+
if contextualPath == nil, track.src == nil {
|
|
68
|
+
if let path = track.path { return .browse(path: path) }
|
|
67
69
|
return .none
|
|
68
70
|
}
|
|
69
71
|
|
|
72
|
+
let selection = beginSelection()
|
|
73
|
+
let playback: PlannedPlayback = if let contextualPath {
|
|
74
|
+
await contextualPlayback(contextualPath, track: track, player: player)
|
|
75
|
+
} else {
|
|
76
|
+
.single(track)
|
|
77
|
+
}
|
|
78
|
+
guard isLatest(selection) else { return .superseded }
|
|
79
|
+
|
|
70
80
|
let event = TrackLoadEvent(
|
|
71
81
|
track: track,
|
|
72
82
|
queue: playback.queue,
|
|
@@ -76,11 +86,21 @@ class TrackSelector {
|
|
|
76
86
|
if await browserManager.awaitTrackLoadHandler(event: event) {
|
|
77
87
|
return .intercepted
|
|
78
88
|
}
|
|
89
|
+
guard isLatest(selection) else { return .superseded }
|
|
79
90
|
return .play(playback.intent)
|
|
80
91
|
}
|
|
81
92
|
|
|
82
93
|
// MARK: - Private Helpers
|
|
83
94
|
|
|
95
|
+
private func beginSelection() -> UInt {
|
|
96
|
+
latestSelection += 1
|
|
97
|
+
return latestSelection
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
private func isLatest(_ selection: UInt) -> Bool {
|
|
101
|
+
selection == latestSelection
|
|
102
|
+
}
|
|
103
|
+
|
|
84
104
|
/// What a selection plays, and the queue and index the track-load handler is shown.
|
|
85
105
|
private struct PlannedPlayback {
|
|
86
106
|
let queue: [Track]
|
|
@@ -9,14 +9,15 @@ enum ArtworkImageFetcher {
|
|
|
9
9
|
private static let logger = Logger(subsystem: "com.audiobrowser", category: "ArtworkImageFetcher")
|
|
10
10
|
|
|
11
11
|
/// Returns nil when the image cannot be loaded, logging a failed fetch (not an unparseable URI). A stale image whose refetch fails
|
|
12
|
-
/// falls back to the cached copy.
|
|
12
|
+
/// falls back to the cached copy.
|
|
13
|
+
/// - Parameter fitting: Fits the image into `size` points at `scale`, rasterizing it as an SVG
|
|
14
|
+
/// when `isSvg`; nil keeps the image as fetched.
|
|
13
15
|
/// - Parameter waitsForConnectivity: A fetch that fails for want of a connection waits for one
|
|
14
16
|
/// and tries again. A cancelled fetch that is waiting ends when the connection returns.
|
|
15
17
|
@MainActor
|
|
16
18
|
static func fetchImage(
|
|
17
19
|
from source: ImageSource,
|
|
18
|
-
|
|
19
|
-
downsampleTo: (size: CGSize, scale: CGFloat)? = nil,
|
|
20
|
+
fitting: (size: CGSize, scale: CGFloat, isSvg: Bool)? = nil,
|
|
20
21
|
waitsForConnectivity: Bool = false,
|
|
21
22
|
) async -> UIImage? {
|
|
22
23
|
guard let url = URL(string: source.uri) else { return nil }
|
|
@@ -33,14 +34,14 @@ enum ArtworkImageFetcher {
|
|
|
33
34
|
options.append(.requestModifier(modifier))
|
|
34
35
|
}
|
|
35
36
|
let processor: (any ImageProcessor)?
|
|
36
|
-
if let
|
|
37
|
-
processor = SVGProcessor(
|
|
38
|
-
} else if let
|
|
37
|
+
if let fitting, fitting.isSvg {
|
|
38
|
+
processor = SVGProcessor(slot: fitting.size, scale: fitting.scale)
|
|
39
|
+
} else if let fitting {
|
|
39
40
|
// The only sizing that is guaranteed: a size hint sent upstream is advisory and a CDN may
|
|
40
41
|
// return the original. cacheOriginalImage keeps the original on disk so another target
|
|
41
42
|
// size re-processes it instead of downloading it again.
|
|
42
|
-
processor = DownsamplingImageProcessor(size:
|
|
43
|
-
options.append(.scaleFactor(
|
|
43
|
+
processor = DownsamplingImageProcessor(size: fitting.size)
|
|
44
|
+
options.append(.scaleFactor(fitting.scale))
|
|
44
45
|
options.append(.cacheOriginalImage)
|
|
45
46
|
} else {
|
|
46
47
|
processor = nil
|
|
@@ -8,20 +8,14 @@ struct SVGProcessor: ImageProcessor {
|
|
|
8
8
|
// not in the key), so every render parameter must be here or different
|
|
9
9
|
// rasterizations of one URL collide.
|
|
10
10
|
var identifier: String {
|
|
11
|
-
"com.audiobrowser.svgprocessor(\(
|
|
11
|
+
"com.audiobrowser.svgprocessor(\(slot.width)x\(slot.height)@\(scale))"
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
/// Points;
|
|
15
|
-
let
|
|
14
|
+
/// Points; the SVG fills as much of it as its aspect ratio allows.
|
|
15
|
+
let slot: CGSize
|
|
16
16
|
|
|
17
17
|
let scale: CGFloat
|
|
18
18
|
|
|
19
|
-
@MainActor
|
|
20
|
-
init(size: CGSize? = nil, scale: CGFloat? = nil) {
|
|
21
|
-
self.size = size
|
|
22
|
-
self.scale = scale ?? appDisplayScale
|
|
23
|
-
}
|
|
24
|
-
|
|
25
19
|
func process(item: ImageProcessItem, options _: KingfisherParsedOptionsInfo) -> KFCrossPlatformImage? {
|
|
26
20
|
switch item {
|
|
27
21
|
case let .data(data):
|
|
@@ -33,17 +27,12 @@ struct SVGProcessor: ImageProcessor {
|
|
|
33
27
|
}
|
|
34
28
|
}
|
|
35
29
|
|
|
30
|
+
/// Nil for an SVG that declares no usable size, which SwiftDraw cannot scale to the slot.
|
|
36
31
|
private func renderSVG(from data: Data) -> UIImage? {
|
|
37
|
-
guard let svg = SVG(data: data) else {
|
|
32
|
+
guard let svg = SVG(data: data), let size = svg.size.aspectFitted(in: slot) else {
|
|
38
33
|
return nil
|
|
39
34
|
}
|
|
40
35
|
|
|
41
|
-
|
|
42
|
-
size
|
|
43
|
-
} else {
|
|
44
|
-
svg.size
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
return svg.rasterize(size: renderSize, scale: scale)
|
|
36
|
+
return svg.rasterize(size: size, scale: scale)
|
|
48
37
|
}
|
|
49
38
|
}
|
|
@@ -32,9 +32,12 @@ function isTransformableRequestConfig(source) {
|
|
|
32
32
|
}
|
|
33
33
|
function isRouteConfig(source) {
|
|
34
34
|
if (!isObjectValue(source)) return false;
|
|
35
|
-
//
|
|
36
|
-
//
|
|
37
|
-
//
|
|
35
|
+
// A static ResolvedTrack page's `artwork` may be an object too (an
|
|
36
|
+
// ArtworkVariants pair), so its required `title` rules it out first — no
|
|
37
|
+
// RouteConfig field is named `title`.
|
|
38
|
+
if ('title' in source) return false;
|
|
39
|
+
// `browse`/`media` keys only exist on RouteConfig. Its `artwork` is a config
|
|
40
|
+
// object, never a string URL.
|
|
38
41
|
return 'browse' in source || 'media' in source || isObjectValue(source.artwork);
|
|
39
42
|
}
|
|
40
43
|
function splitLayer(layer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isCallback","source","isObjectValue","value","isTransformableRequestConfig","isRouteConfig","artwork","splitLayer","layer","resolve","resolver","Promise","config","flattenBrowseSource","browseCallback","browseConfig","browseStatic","searchSourceToRouteEntry","path","SEARCH_ROUTE_PATH","searchCallback","searchConfig","wrapTracksAsResolvedTrack","tracks","TABS_ROUTE_PATH","title","children","tabsSourceToRouteEntry","Array","isArray","wrappedCallback","flattenRouteEntry","browse","media","DEFAULT_ROUTE_PATH","exports","flattenRoutes","routes","tabs","search","entries","Object","push","length","undefined","MAX_TABS","validateBrowserConfiguration","warn","message","console","startsWith","page","toNativeConfig","request","requestResolver","browseResolver","nowPlayingArtwork","singleTrack","handleTrackLoad","androidControllerOfflineError","viewMoreTitle","carPlayLoadingTitle","resolveAlbumPath","formatNavigationError"],"sourceRoot":"../../../src","sources":["features/browser-config.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["isCallback","source","isObjectValue","value","isTransformableRequestConfig","isRouteConfig","artwork","splitLayer","layer","resolve","resolver","Promise","config","flattenBrowseSource","browseCallback","browseConfig","browseStatic","searchSourceToRouteEntry","path","SEARCH_ROUTE_PATH","searchCallback","searchConfig","wrapTracksAsResolvedTrack","tracks","TABS_ROUTE_PATH","title","children","tabsSourceToRouteEntry","Array","isArray","wrappedCallback","flattenRouteEntry","browse","media","DEFAULT_ROUTE_PATH","exports","flattenRoutes","routes","tabs","search","entries","Object","push","length","undefined","MAX_TABS","validateBrowserConfiguration","warn","message","console","startsWith","page","toNativeConfig","request","requestResolver","browseResolver","nowPlayingArtwork","singleTrack","handleTrackLoad","androidControllerOfflineError","viewMoreTitle","carPlayLoadingTitle","resolveAlbumPath","formatNavigationError"],"sourceRoot":"../../../src","sources":["features/browser-config.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -81,11 +81,15 @@ var _useNativeUpdatedValue = require("../utils/useNativeUpdatedValue");
|
|
|
81
81
|
// MARK: - Getters
|
|
82
82
|
|
|
83
83
|
/**
|
|
84
|
-
* Gets the current playback error, if any.
|
|
85
|
-
*
|
|
84
|
+
* Gets the current terminal playback error, if any. An error the player is
|
|
85
|
+
* still retrying (`retrying: true`) is on `getPlayback().error` instead.
|
|
86
|
+
* @returns The error of the `error` state, or undefined outside it
|
|
86
87
|
*/
|
|
87
88
|
function getPlaybackError() {
|
|
88
|
-
|
|
89
|
+
// Native also holds the retrying error here, which no `onPlaybackError`
|
|
90
|
+
// announces or clears.
|
|
91
|
+
const error = _native.nativeBrowser.getPlaybackError();
|
|
92
|
+
return error?.retrying ? undefined : error;
|
|
89
93
|
}
|
|
90
94
|
|
|
91
95
|
// MARK: - Event Callbacks
|
|
@@ -100,8 +104,9 @@ const onPlaybackError = exports.onPlaybackError = _NativeUpdatedValue.NativeUpda
|
|
|
100
104
|
// MARK: - Hooks
|
|
101
105
|
|
|
102
106
|
/**
|
|
103
|
-
* Hook that returns the current playback error and updates when it
|
|
104
|
-
*
|
|
107
|
+
* Hook that returns the current terminal playback error and updates when it
|
|
108
|
+
* changes. An error the player is still retrying is on `usePlayback().error`.
|
|
109
|
+
* @returns The current terminal playback error or undefined
|
|
105
110
|
*/
|
|
106
111
|
function usePlaybackError() {
|
|
107
112
|
return (0, _useNativeUpdatedValue.useNativeUpdatedValue)(getPlaybackError, onPlaybackError, 'error');
|
|
@@ -159,8 +164,8 @@ const onFormattedNavigationError = exports.onFormattedNavigationError = _NativeU
|
|
|
159
164
|
* in `BrowserConfiguration`, or falls back to built-in English titles with the
|
|
160
165
|
* error's own message. An HTTP error's title is its status text,
|
|
161
166
|
* system-localized on iOS; on Android an English name for common codes. It is
|
|
162
|
-
* `Server Error` when there is no status code, for
|
|
163
|
-
* name, and always on web.
|
|
167
|
+
* `Server Error` when there is no status code, for a 2xx (a response that
|
|
168
|
+
* did not parse), for codes Android does not name, and always on web.
|
|
164
169
|
*
|
|
165
170
|
* CarPlay and Android Auto format their own browse errors with the same
|
|
166
171
|
* `formatNavigationError` callback, so the copy matches across your app and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","getPlaybackError","nativeBrowser","onPlaybackError","exports","NativeUpdatedValue","emitterize","cb","usePlaybackError","useNativeUpdatedValue","getNavigationError","
|
|
1
|
+
{"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeUpdatedValue","getPlaybackError","error","nativeBrowser","retrying","undefined","onPlaybackError","exports","NativeUpdatedValue","emitterize","cb","usePlaybackError","useNativeUpdatedValue","getNavigationError","onNavigationError","useNavigationError","getFormattedNavigationError","onFormattedNavigationError","useFormattedNavigationError"],"sourceRoot":"../../../src","sources":["features/errors.ts"],"mappings":";;;;;;;;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AAEA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAWA;;AA+BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAUA;;AAWA;AACA;AACA;;AAKA;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASG,gBAAgBA,CAAA,EAA8B;EAC5D;EACA;EACA,MAAMC,KAAK,GAAGC,qBAAa,CAACF,gBAAgB,CAAC,CAAC;EAC9C,OAAOC,KAAK,EAAEE,QAAQ,GAAGC,SAAS,GAAGH,KAAK;AAC5C;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMI,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAC1BE,sCAAkB,CAACC,UAAU,CAC1BC,EAAE,IAAMP,qBAAa,CAACG,eAAe,GAAGI,EAC3C,CAAC;;AAEH;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,gBAAgBA,CAAA,EAA8B;EAC5D,OAAO,IAAAC,4CAAqB,EAACX,gBAAgB,EAAEK,eAAe,EAAE,OAAO,CAAC;AAC1E;;AAEA;;AAEA;AACA;AACA;AACA;AACO,SAASO,kBAAkBA,CAAA,EAAgC;EAChE,MAAMX,KAAK,GAAGC,qBAAa,CAACU,kBAAkB,CAAC,CAAC;EAChD,OAAOX,KAAK,IAAIG,SAAS;AAC3B;;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMS,iBAAiB,GAAAP,OAAA,CAAAO,iBAAA,GAC5BN,sCAAkB,CAACC,UAAU,CAC1BC,EAAE,IAAMP,qBAAa,CAACW,iBAAiB,GAAGJ,EAC7C,CAAC;;AAEH;AACA;AACA;AACA;AACO,SAASK,kBAAkBA,CAAA,EAAgC;EAChE,OAAO,IAAAH,4CAAqB,EAACC,kBAAkB,EAAEC,iBAAiB,EAAE,OAAO,CAAC;AAC9E;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,2BAA2BA,CAAA,EAE7B;EACZ,OAAOb,qBAAa,CAACa,2BAA2B,CAAC,CAAC,IAAIX,SAAS;AACjE;;AAEA;AACA;AACA;AACA;AACO,MAAMY,0BAA0B,GAAAV,OAAA,CAAAU,0BAAA,GAAGT,sCAAkB,CAACC,UAAU,CAEpEC,EAAE,IAAMP,qBAAa,CAACc,0BAA0B,GAAGP,EAAG,CAAC;;AAE1D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASQ,2BAA2BA,CAAA,EAE7B;EACZ,OAAO,IAAAN,4CAAqB,EAC1BI,2BAA2B,EAC3BC,0BACF,CAAC;AACH","ignoreList":[]}
|
|
@@ -11,7 +11,8 @@ exports.updateNowPlaying = updateNowPlaying;
|
|
|
11
11
|
exports.useNowPlaying = useNowPlaying;
|
|
12
12
|
var _native = require("../native");
|
|
13
13
|
var _NativeUpdatedValue = require("../utils/NativeUpdatedValue");
|
|
14
|
-
var
|
|
14
|
+
var _useNativeValueRefreshedBy = require("../utils/useNativeValueRefreshedBy");
|
|
15
|
+
var _activeTrack = require("./queue/activeTrack");
|
|
15
16
|
// MARK: - Functions
|
|
16
17
|
|
|
17
18
|
/**
|
|
@@ -100,11 +101,16 @@ const onNowPlayingChanged = exports.onNowPlayingChanged = _NativeUpdatedValue.Na
|
|
|
100
101
|
|
|
101
102
|
// MARK: - Hooks
|
|
102
103
|
|
|
104
|
+
// `onNowPlayingChanged` cannot report that the metadata went away with the
|
|
105
|
+
// active track. Module-level so the hook's subscription identity is stable.
|
|
106
|
+
const nowPlayingInvalidators = [onNowPlayingChanged, _activeTrack.onActiveTrackChanged];
|
|
107
|
+
|
|
103
108
|
/**
|
|
104
|
-
* Hook that returns the current now playing metadata and updates when it
|
|
109
|
+
* Hook that returns the current now playing metadata and updates when it
|
|
110
|
+
* changes, to `undefined` when the active track goes away.
|
|
105
111
|
* @returns The current now playing metadata or undefined
|
|
106
112
|
*/
|
|
107
113
|
function useNowPlaying() {
|
|
108
|
-
return (0,
|
|
114
|
+
return (0, _useNativeValueRefreshedBy.useNativeValueRefreshedBy)(getNowPlaying, nowPlayingInvalidators);
|
|
109
115
|
}
|
|
110
116
|
//# sourceMappingURL=nowPlaying.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_native","require","_NativeUpdatedValue","
|
|
1
|
+
{"version":3,"names":["_native","require","_NativeUpdatedValue","_useNativeValueRefreshedBy","_activeTrack","updateNowPlaying","update","nativeBrowser","undefined","getNowPlaying","flashNowPlaying","durationMs","clearNowPlayingFlash","onNowPlayingChanged","exports","NativeUpdatedValue","emitterize","cb","nowPlayingInvalidators","onActiveTrackChanged","useNowPlaying","useNativeValueRefreshedBy"],"sourceRoot":"../../../src","sources":["features/nowPlaying.ts"],"mappings":";;;;;;;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,0BAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASI,gBAAgBA,CAACC,MAA+B,EAAQ;EACtEC,qBAAa,CAACF,gBAAgB,CAACC,MAAM,IAAIE,SAAS,CAAC;AACrD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,aAAaA,CAAA,EAAmC;EAC9D,OAAOF,qBAAa,CAACE,aAAa,CAAC,CAAC,IAAID,SAAS;AACnD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,eAAeA,CAC7BJ,MAAwB,EACxBK,UAAkB,EACZ;EACNJ,qBAAa,CAACG,eAAe,CAACJ,MAAM,EAAEK,UAAU,CAAC;AACnD;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,oBAAoBA,CAAA,EAAS;EAC3CL,qBAAa,CAACK,oBAAoB,CAAC,CAAC;AACtC;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,GAC9BE,sCAAkB,CAACC,UAAU,CAC1BC,EAAE,IAAMV,qBAAa,CAACM,mBAAmB,GAAGI,EAC/C,CAAC;;AAEH;;AAEA;AACA;AACA,MAAMC,sBAAsB,GAAG,CAACL,mBAAmB,EAAEM,iCAAoB,CAAC;;AAE1E;AACA;AACA;AACA;AACA;AACO,SAASC,aAAaA,CAAA,EAAmC;EAC9D,OAAO,IAAAC,oDAAyB,EAACZ,aAAa,EAAES,sBAAsB,CAAC;AACzE","ignoreList":[]}
|
|
@@ -78,8 +78,7 @@ function seekTo(position) {
|
|
|
78
78
|
* Jump to the live edge of the current track; no-op unless the track
|
|
79
79
|
* declares `live: true`. A stream with a seekable live window (HLS) seeks
|
|
80
80
|
* to the window's edge; a non-seekable stream (e.g. ICY radio) reconnects
|
|
81
|
-
* to rejoin live
|
|
82
|
-
* reuses the resolved URL and re-resolves only after it fails to open.
|
|
81
|
+
* to rejoin live, re-running `media.resolve` for a fresh URL.
|
|
83
82
|
*/
|
|
84
83
|
function seekToLiveEdge() {
|
|
85
84
|
_native.nativeBrowser.seekToLiveEdge();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_native","require","reset","nativeBrowser","play","pause","togglePlayback","stop","retry","seekTo","position","seekToLiveEdge","seekBy","offset"],"sourceRoot":"../../../../src","sources":["features/playback/controls.ts"],"mappings":";;;;;;;;;;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AAFA;;AAIA;AACA;AACA;AACO,SAASC,KAAKA,CAAA,EAAS;EAC5BC,qBAAa,CAACD,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACO,SAASE,IAAIA,CAAA,EAAS;EAC3BD,qBAAa,CAACC,IAAI,CAAC,CAAC;AACtB;;AAEA;AACA;AACA;AACO,SAASC,KAAKA,CAAA,EAAS;EAC5BF,qBAAa,CAACE,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACO,SAASC,cAAcA,CAAA,EAAS;EACrCH,qBAAa,CAACG,cAAc,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,IAAIA,CAAA,EAAS;EAC3BJ,qBAAa,CAACI,IAAI,CAAC,CAAC;AACtB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,KAAKA,CAAA,EAAS;EAC5BL,qBAAa,CAACK,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACA;AACO,SAASC,MAAMA,CAACC,QAAgB,EAAQ;EAC7CP,qBAAa,CAACM,MAAM,CAACC,QAAQ,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACA;
|
|
1
|
+
{"version":3,"names":["_native","require","reset","nativeBrowser","play","pause","togglePlayback","stop","retry","seekTo","position","seekToLiveEdge","seekBy","offset"],"sourceRoot":"../../../../src","sources":["features/playback/controls.ts"],"mappings":";;;;;;;;;;;;;;AAEA,IAAAA,OAAA,GAAAC,OAAA;AAFA;;AAIA;AACA;AACA;AACO,SAASC,KAAKA,CAAA,EAAS;EAC5BC,qBAAa,CAACD,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACO,SAASE,IAAIA,CAAA,EAAS;EAC3BD,qBAAa,CAACC,IAAI,CAAC,CAAC;AACtB;;AAEA;AACA;AACA;AACO,SAASC,KAAKA,CAAA,EAAS;EAC5BF,qBAAa,CAACE,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACO,SAASC,cAAcA,CAAA,EAAS;EACrCH,qBAAa,CAACG,cAAc,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASC,IAAIA,CAAA,EAAS;EAC3BJ,qBAAa,CAACI,IAAI,CAAC,CAAC;AACtB;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,KAAKA,CAAA,EAAS;EAC5BL,qBAAa,CAACK,KAAK,CAAC,CAAC;AACvB;;AAEA;AACA;AACA;AACA;AACO,SAASC,MAAMA,CAACC,QAAgB,EAAQ;EAC7CP,qBAAa,CAACM,MAAM,CAACC,QAAQ,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,cAAcA,CAAA,EAAS;EACrCR,qBAAa,CAACQ,cAAc,CAAC,CAAC;AAChC;;AAEA;AACA;AACA;AACA;AACO,SAASC,MAAMA,CAACC,MAAc,EAAQ;EAC3CV,qBAAa,CAACS,MAAM,CAACC,MAAM,CAAC;AAC9B","ignoreList":[]}
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.trackPlaybackTime = trackPlaybackTime;
|
|
7
7
|
var _native = require("../../native");
|
|
8
|
+
var _callListener = require("../../utils/callListener");
|
|
8
9
|
var _activeTrack = require("../queue/activeTrack");
|
|
9
10
|
// MARK: - Types
|
|
10
11
|
|
|
@@ -25,7 +26,7 @@ function onTick() {
|
|
|
25
26
|
const sinceLast = handle.totalSeconds - handle.lastFireSeconds;
|
|
26
27
|
if (sinceLast >= handle.period) {
|
|
27
28
|
handle.lastFireSeconds = handle.totalSeconds;
|
|
28
|
-
handle.callback
|
|
29
|
+
(0, _callListener.callListener)(handle.callback, {
|
|
29
30
|
total: handle.totalSeconds,
|
|
30
31
|
sinceLast,
|
|
31
32
|
track: currentTrack
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_native","require","_activeTrack","handles","Set","installed","currentTrack","onTick","handle","totalSeconds","sinceLast","lastFireSeconds","period","callback","total","track","install","nativeBrowser","onPlaybackInterval","onActiveTrackChanged","addListener","event","trackPlaybackTime","Error","add","size","setPlaybackIntervalEnabled","delete"],"sourceRoot":"../../../../src","sources":["features/playback/trackPlaybackTime.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,
|
|
1
|
+
{"version":3,"names":["_native","require","_callListener","_activeTrack","handles","Set","installed","currentTrack","onTick","handle","totalSeconds","sinceLast","lastFireSeconds","period","callListener","callback","total","track","install","nativeBrowser","onPlaybackInterval","onActiveTrackChanged","addListener","event","trackPlaybackTime","Error","add","size","setPlaybackIntervalEnabled","delete"],"sourceRoot":"../../../../src","sources":["features/playback/trackPlaybackTime.ts"],"mappings":";;;;;;AACA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAEA;;AAEA;;AAoBA;;AAEA,MAAMG,OAAO,GAAG,IAAIC,GAAG,CAAS,CAAC;AACjC,IAAIC,SAAS,GAAG,KAAK;AACrB,IAAIC,YAA+B;;AAEnC;AACA;AACA;AACA,SAASC,MAAMA,CAAA,EAAG;EAChB,KAAK,MAAMC,MAAM,IAAIL,OAAO,EAAE;IAC5BK,MAAM,CAACC,YAAY,IAAI,CAAC;IACxB,MAAMC,SAAS,GAAGF,MAAM,CAACC,YAAY,GAAGD,MAAM,CAACG,eAAe;IAC9D,IAAID,SAAS,IAAIF,MAAM,CAACI,MAAM,EAAE;MAC9BJ,MAAM,CAACG,eAAe,GAAGH,MAAM,CAACC,YAAY;MAC5C,IAAAI,0BAAY,EAACL,MAAM,CAACM,QAAQ,EAAE;QAC5BC,KAAK,EAAEP,MAAM,CAACC,YAAY;QAC1BC,SAAS;QACTM,KAAK,EAAEV;MACT,CAAC,CAAC;IACJ;EACF;AACF;AAEA,SAASW,OAAOA,CAAA,EAAG;EACjB,IAAIZ,SAAS,EAAE;EACfA,SAAS,GAAG,IAAI;EAChBa,qBAAa,CAACC,kBAAkB,GAAGZ,MAAM;EACzCa,iCAAoB,CAACC,WAAW,CAAEC,KAAK,IAAK;IAC1ChB,YAAY,GAAGgB,KAAK,CAACN,KAAK;EAC5B,CAAC,CAAC;AACJ;;AAEA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASO,iBAAiBA,CAC/BT,QAA4C,EAC5CF,MAAc,EACF;EACZ,IAAI,EAAEA,MAAM,IAAI,CAAC,CAAC,EAAE;IAClB,MAAM,IAAIY,KAAK,CAAC,wCAAwC,CAAC;EAC3D;EACAP,OAAO,CAAC,CAAC;EACT,MAAMT,MAAc,GAAG;IACrBI,MAAM;IACNH,YAAY,EAAE,CAAC;IACfE,eAAe,EAAE,CAAC;IAClBG;EACF,CAAC;EACDX,OAAO,CAACsB,GAAG,CAACjB,MAAM,CAAC;EACnB,IAAIL,OAAO,CAACuB,IAAI,KAAK,CAAC,EAAER,qBAAa,CAACS,0BAA0B,CAAC,IAAI,CAAC;EACtE,OAAO,MAAM;IACX,IAAI,CAACxB,OAAO,CAACyB,MAAM,CAACpB,MAAM,CAAC,EAAE;IAC7B,IAAIL,OAAO,CAACuB,IAAI,KAAK,CAAC,EAAER,qBAAa,CAACS,0BAA0B,CAAC,KAAK,CAAC;EACzE,CAAC;AACH","ignoreList":[]}
|
|
@@ -311,8 +311,8 @@ function nonEmpty(key, value) {
|
|
|
311
311
|
*
|
|
312
312
|
* Calling it again is how a setup-only option changes after launch, and works differently per
|
|
313
313
|
* platform. On Android, newly provided fields are merged over the previous ones, except
|
|
314
|
-
* `remoteOutputs`, which is off when left out, and `nowPlaying`, which is
|
|
315
|
-
*
|
|
314
|
+
* `remoteOutputs`, which is off when left out, and `nowPlaying`, which is `true` when left
|
|
315
|
+
* out: an earlier formatter stays only when the call passes it again. The audio engine is rebuilt
|
|
316
316
|
* only when construction-bound fields (buffers, wake mode, …) changed. On iOS, each call
|
|
317
317
|
* replaces the player: the queue is cleared, and setup-only fields you omit (`ios` session
|
|
318
318
|
* category and `buffer`, `retry`, …) go back to their defaults. Runtime options set earlier
|