react-native-audio-browser 1.0.0-next.5 → 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.
Files changed (192) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
  5. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  6. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  7. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  8. package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
  9. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
  10. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  11. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  12. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  13. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  14. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  15. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  16. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  17. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  18. package/android/src/main/res/values/strings.xml +5 -2
  19. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  20. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  21. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  22. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  23. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  24. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  25. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  26. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  27. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  28. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  30. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  31. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  32. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  33. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  34. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  35. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  36. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  37. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  38. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  39. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  40. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  41. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  42. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  43. package/ios/AVPlayerEngine.swift +2 -2
  44. package/ios/Browser/BrowserPathHelper.swift +3 -2
  45. package/ios/Browser/PageResolver.swift +1 -1
  46. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  47. package/ios/HybridAudioBrowser+Player.swift +3 -2
  48. package/ios/HybridAudioBrowser.swift +1 -1
  49. package/ios/Player/Player.swift +4 -2
  50. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  51. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  52. package/ios/Tests/GenerationMemoTests.swift +136 -0
  53. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  54. package/ios/Tests/PlayerPolicyTests.swift +19 -28
  55. package/ios/Tests/PlayerProgressTests.swift +0 -2
  56. package/ios/Tests/RequestLayerTests.swift +5 -0
  57. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  58. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  59. package/ios/Tests/Support/TestTypes.swift +14 -0
  60. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  61. package/ios/Util/AwaitCallback.swift +16 -10
  62. package/ios/Util/GenerationMemo.swift +81 -17
  63. package/ios/Util/JSCallbackError.swift +23 -0
  64. package/ios/Util/OutputPicker.swift +25 -5
  65. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  66. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  67. package/lib/commonjs/features/browser-config.js +3 -2
  68. package/lib/commonjs/features/browser-config.js.map +1 -1
  69. package/lib/commonjs/features/browser.js +7 -8
  70. package/lib/commonjs/features/browser.js.map +1 -1
  71. package/lib/commonjs/features/output.js +7 -3
  72. package/lib/commonjs/features/output.js.map +1 -1
  73. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  74. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  75. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  76. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  77. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  78. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  79. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  80. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  81. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  82. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  83. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  84. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  85. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  86. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  87. package/lib/module/features/browser-config.js +3 -2
  88. package/lib/module/features/browser-config.js.map +1 -1
  89. package/lib/module/features/browser.js +7 -8
  90. package/lib/module/features/browser.js.map +1 -1
  91. package/lib/module/features/output.js +7 -3
  92. package/lib/module/features/output.js.map +1 -1
  93. package/lib/module/web/NativeAudioBrowser.js +43 -2
  94. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  95. package/lib/module/web/browser/BrowserManager.js +37 -66
  96. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  97. package/lib/module/web/browser/SearchManager.js +1 -5
  98. package/lib/module/web/browser/SearchManager.js.map +1 -1
  99. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  100. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  101. package/lib/module/web/player/NowPlayingManager.js +3 -22
  102. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  103. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  104. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  105. package/lib/module/web/util/GenerationMemo.js +87 -0
  106. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  107. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  108. package/lib/typescript/src/features/browser.d.ts +7 -8
  109. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  110. package/lib/typescript/src/features/output.d.ts +8 -4
  111. package/lib/typescript/src/features/output.d.ts.map +1 -1
  112. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  113. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  114. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  115. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  116. package/lib/typescript/src/types/browser.d.ts +55 -8
  117. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  118. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  119. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  120. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  121. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  122. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  123. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  124. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  125. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  126. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  127. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  128. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  129. 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
  130. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  131. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  132. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  133. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  134. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  135. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  136. 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
  137. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  138. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  139. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  140. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  141. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  142. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  143. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  144. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  145. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  146. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  147. 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
  148. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  149. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  150. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  151. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  152. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  153. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  154. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  155. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  156. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  157. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  158. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  159. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  160. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  161. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  162. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  163. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  164. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  165. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  166. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  167. package/package.json +1 -1
  168. package/src/codegen-js-error-message.test.ts +78 -0
  169. package/src/features/browser-config.test.ts +7 -0
  170. package/src/features/browser-config.ts +3 -2
  171. package/src/features/browser.ts +7 -8
  172. package/src/features/output.ts +13 -5
  173. package/src/specs/audio-browser.nitro.ts +16 -3
  174. package/src/types/browser-native.ts +4 -1
  175. package/src/types/browser.ts +60 -8
  176. package/src/web/NativeAudioBrowser.ts +43 -3
  177. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  178. package/src/web/browser/BrowserManager.ts +50 -79
  179. package/src/web/browser/SearchManager.ts +1 -8
  180. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  181. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  182. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  183. package/src/web/http/RequestConfigBuilder.ts +72 -57
  184. package/src/web/player/NowPlayingManager.test.ts +29 -0
  185. package/src/web/player/NowPlayingManager.ts +4 -27
  186. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  187. package/src/web/util/BrowserPathHelper.ts +6 -7
  188. package/src/web/util/GenerationMemo.test.ts +148 -0
  189. package/src/web/util/GenerationMemo.ts +103 -0
  190. package/website/guide/audio-output.md +34 -7
  191. package/website/guide/browser.md +21 -0
  192. package/website/guide/gate.md +1 -1
@@ -40,7 +40,8 @@ import type {
40
40
  } from '../features'
41
41
  import type {
42
42
  AudioBrowser as AudioBrowserSpec,
43
- Output
43
+ Output,
44
+ OutputPickerAnchor
44
45
  } from '../specs/audio-browser.nitro'
45
46
  import type {
46
47
  ResolvedTrack,
@@ -69,6 +70,9 @@ import { PlaybackTimer } from './TrackPlayer/PlaybackTimer'
69
70
  import { derivePlayingState } from './TrackPlayer/PlayingStateFactory'
70
71
  import { BrowserPathHelper } from './util/BrowserPathHelper'
71
72
 
73
+ /** Native's now-playing artwork size, so `imageQueryParams` ask for the same image. */
74
+ const SESSION_ARTWORK_SIZE_PX = 1200
75
+
72
76
  /**
73
77
  * Web implementation of AudioBrowser (unified browser + player)
74
78
  */
@@ -103,6 +107,8 @@ export class NativeAudioBrowser
103
107
  private optionsManager: OptionsManager
104
108
  private nowPlayingManager: NowPlayingManager
105
109
  private remoteCommands: RemoteCommandController
110
+ /** The current track's artwork for the OS media controls, once resolved. */
111
+ private sessionArtworkUri: string | undefined
106
112
 
107
113
  // Player state
108
114
  private progressTimer = new PlaybackTimer()
@@ -349,7 +355,37 @@ export class NativeAudioBrowser
349
355
  */
350
356
  private publishNowPlaying(metadata: NowPlayingMetadata): void {
351
357
  this.onNowPlayingChanged(metadata)
352
- this.remoteCommands.setMetadata(metadata)
358
+ this.publishSessionMetadata(metadata)
359
+ }
360
+
361
+ /**
362
+ * Shows no artwork until the current track's has resolved, as iOS does,
363
+ * rather than the raw `artwork`, which the config may not leave a loadable
364
+ * URL.
365
+ */
366
+ private publishSessionMetadata(metadata: NowPlayingMetadata): void {
367
+ this.remoteCommands.setMetadata({
368
+ ...metadata,
369
+ artwork: this.sessionArtworkUri
370
+ })
371
+ }
372
+
373
+ /**
374
+ * Resolves `track`'s artwork at native's now-playing size, falling back to
375
+ * its own `artworkSource` as native does, then republishes the OS metadata
376
+ * if `track` is still current.
377
+ */
378
+ private async resolveSessionArtwork(track: Track): Promise<void> {
379
+ const { nowPlayingArtwork, artwork } = this.browserManager.configuration
380
+ const source = await this.browserManager.resolveArtworkSource(
381
+ track,
382
+ { width: SESSION_ARTWORK_SIZE_PX, height: SESSION_ARTWORK_SIZE_PX },
383
+ nowPlayingArtwork ?? artwork
384
+ )
385
+ if (this.current !== track) return
386
+ this.sessionArtworkUri = source?.uri ?? track.artworkSource?.uri
387
+ const nowPlaying = this.getNowPlaying()
388
+ if (nowPlaying) this.publishSessionMetadata(nowPlaying)
353
389
  }
354
390
 
355
391
  protected setupProgressUpdates(interval?: number) {
@@ -719,6 +755,10 @@ export class NativeAudioBrowser
719
755
  // As Android's onMediaItemTransition does: a new item is a clean slate,
720
756
  // a retry of the same one keeps what the consumer set.
721
757
  this.nowPlayingManager.clearNowPlayingOverride()
758
+ this.sessionArtworkUri = undefined
759
+ this.resolveSessionArtwork(track).catch((error: unknown) => {
760
+ console.error('Failed to publish now-playing artwork:', error)
761
+ })
722
762
 
723
763
  try {
724
764
  this.onPlaybackActiveTrackChanged({
@@ -1247,7 +1287,7 @@ export class NativeAudioBrowser
1247
1287
  return undefined
1248
1288
  }
1249
1289
 
1250
- openOutputPicker(): void {
1290
+ openOutputPicker(_anchor?: OutputPickerAnchor): void {
1251
1291
  // No-op on web
1252
1292
  }
1253
1293
 
@@ -0,0 +1,191 @@
1
+ /** @vitest-environment happy-dom */
2
+
3
+ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
4
+ import type { Track } from '../../types'
5
+ import { LifecycleHarness } from './lifecycleHarness'
6
+
7
+ /**
8
+ * The artwork the OS media controls show goes through the `artwork` config, as
9
+ * on iOS and Android, rather than being the track's raw `artwork`.
10
+ */
11
+
12
+ class FakeMediaMetadata {
13
+ artwork: { src: string }[]
14
+ constructor(init: { artwork?: { src: string }[] }) {
15
+ this.artwork = init.artwork ?? []
16
+ }
17
+ }
18
+
19
+ const session = {
20
+ metadata: null as FakeMediaMetadata | null,
21
+ playbackState: 'none',
22
+ setActionHandler: () => {},
23
+ setPositionState: () => {}
24
+ }
25
+
26
+ function sessionArtwork(): string | undefined {
27
+ return session.metadata?.artwork[0]?.src
28
+ }
29
+
30
+ let h: LifecycleHarness
31
+
32
+ beforeEach(async () => {
33
+ session.metadata = null
34
+ vi.stubGlobal('navigator', { mediaSession: session })
35
+ vi.stubGlobal('MediaMetadata', FakeMediaMetadata)
36
+ h = new LifecycleHarness()
37
+ await h.setup()
38
+ })
39
+
40
+ afterEach(() => {
41
+ vi.unstubAllGlobals()
42
+ })
43
+
44
+ const relative: Track = {
45
+ id: '7',
46
+ title: 'Seven',
47
+ src: 'https://cdn.example.com/7.mp3',
48
+ artwork: '/art/7.jpg'
49
+ }
50
+
51
+ describe('now-playing artwork on the OS media controls', () => {
52
+ it('resolves the artwork through the artwork config', async () => {
53
+ h.browser.configuration = {
54
+ artwork: {
55
+ baseUrl: 'https://img.example.com',
56
+ query: { v: '2' },
57
+ imageQueryParams: { width: 'w' }
58
+ }
59
+ }
60
+
61
+ h.browser.load(relative)
62
+ await h.flush()
63
+
64
+ expect(sessionArtwork()).toBe(
65
+ 'https://img.example.com/art/7.jpg?v=2&w=1200'
66
+ )
67
+ })
68
+
69
+ it('resolves the artwork through nowPlayingArtwork when it is set', async () => {
70
+ h.browser.configuration = {
71
+ artwork: { baseUrl: 'https://img.example.com' },
72
+ nowPlayingArtwork: {
73
+ baseUrl: 'https://np.example.com',
74
+ path: '/artwork/{id}'
75
+ }
76
+ }
77
+
78
+ h.browser.load(relative)
79
+ await h.flush()
80
+
81
+ expect(sessionArtwork()).toBe('https://np.example.com/artwork/7')
82
+ })
83
+
84
+ it("runs the artwork config's resolve and transform", async () => {
85
+ h.browser.configuration = {
86
+ artwork: {
87
+ resolve: (track) =>
88
+ Promise.resolve({ path: `/covers/${track.id}.png` }),
89
+ transform: ({ request }) =>
90
+ Promise.resolve({ ...request, baseUrl: 'https://signed.example.com' })
91
+ }
92
+ }
93
+
94
+ h.browser.load(relative)
95
+ await h.flush()
96
+
97
+ expect(sessionArtwork()).toBe('https://signed.example.com/covers/7.png')
98
+ })
99
+
100
+ it('keeps the resolved artwork when an override changes the title', async () => {
101
+ h.browser.configuration = {
102
+ artwork: { baseUrl: 'https://img.example.com' }
103
+ }
104
+ h.browser.load(relative)
105
+ await h.flush()
106
+
107
+ h.browser.updateNowPlaying({ title: 'Live title' })
108
+
109
+ expect(sessionArtwork()).toBe('https://img.example.com/art/7.jpg')
110
+ })
111
+
112
+ it("does not show a track's artwork once a later track has replaced it", async () => {
113
+ let releaseFirst: () => void = () => {}
114
+ h.browser.configuration = {
115
+ artwork: {
116
+ baseUrl: 'https://img.example.com',
117
+ resolve: (track) =>
118
+ track.id === '7'
119
+ ? new Promise((resolve) => {
120
+ releaseFirst = () => resolve({})
121
+ })
122
+ : Promise.resolve({})
123
+ }
124
+ }
125
+
126
+ h.browser.load(relative)
127
+ await h.flush()
128
+ h.browser.load({ ...relative, id: '8', artwork: '/art/8.jpg' })
129
+ await h.flush()
130
+ releaseFirst()
131
+ await h.flush()
132
+
133
+ expect(sessionArtwork()).toBe('https://img.example.com/art/8.jpg')
134
+ })
135
+
136
+ it('shows no artwork for a new track until its own has resolved', async () => {
137
+ let releaseSecond: () => void = () => {}
138
+ h.browser.configuration = {
139
+ artwork: {
140
+ baseUrl: 'https://img.example.com',
141
+ resolve: (track) =>
142
+ track.id === '8'
143
+ ? new Promise((resolve) => {
144
+ releaseSecond = () => resolve({})
145
+ })
146
+ : Promise.resolve({})
147
+ }
148
+ }
149
+ h.browser.load(relative)
150
+ await h.flush()
151
+
152
+ h.browser.load({ ...relative, id: '8', artwork: '/art/8.jpg' })
153
+ await h.flush()
154
+ expect(sessionArtwork()).toBeUndefined()
155
+
156
+ releaseSecond()
157
+ await h.flush()
158
+ expect(sessionArtwork()).toBe('https://img.example.com/art/8.jpg')
159
+ })
160
+
161
+ it('shows no artwork when the request layer fails to resolve', async () => {
162
+ vi.spyOn(console, 'error').mockImplementation(() => {})
163
+ h.browser.configuration = {
164
+ requestResolver: () => Promise.reject(new Error('token refresh failed')),
165
+ artwork: {}
166
+ }
167
+
168
+ h.browser.load(relative)
169
+ await h.flush()
170
+
171
+ expect(session.metadata).not.toBeNull()
172
+ expect(sessionArtwork()).toBeUndefined()
173
+ })
174
+
175
+ it("falls back to the track's artworkSource when its artwork resolves to nothing", async () => {
176
+ vi.spyOn(console, 'error').mockImplementation(() => {})
177
+ h.browser.configuration = {
178
+ artwork: {
179
+ transform: () => Promise.reject(new Error('signing failed'))
180
+ }
181
+ }
182
+
183
+ h.browser.load({
184
+ ...relative,
185
+ artworkSource: { uri: 'https://img.example.com/supplied.jpg' }
186
+ })
187
+ await h.flush()
188
+
189
+ expect(sessionArtwork()).toBe('https://img.example.com/supplied.jpg')
190
+ })
191
+ })
@@ -1,5 +1,8 @@
1
1
  import type { NavigationErrorType } from '../../features'
2
2
  import type {
3
+ ArtworkRequestConfig,
4
+ ImageContext,
5
+ ImageSource,
3
6
  Track,
4
7
  ResolvedTrack,
5
8
  Section,
@@ -14,6 +17,7 @@ import { assertedNotNullish } from '../../utils/validation'
14
17
  import { RequestConfigBuilder } from '../http/RequestConfigBuilder'
15
18
  import { SimpleRouter } from '../SimpleRouter'
16
19
  import { BrowserPathHelper } from '../util/BrowserPathHelper'
20
+ import { GenerationMemo } from '../util/GenerationMemo'
17
21
  import { assertBrowsePageShape } from './assertBrowsePageShape'
18
22
  import { parseSearchResponse } from './parseSearchResponse'
19
23
  import {
@@ -23,6 +27,11 @@ import {
23
27
  sectionContaining
24
28
  } from './sections'
25
29
 
30
+ type ResolvedLayers = {
31
+ request?: TransformableRequestConfig
32
+ browse?: TransformableRequestConfig
33
+ }
34
+
26
35
  /**
27
36
  * Manages browser navigation, route resolution, and content loading.
28
37
  * Coordinates between HTTP client, favorite manager, and error manager.
@@ -35,18 +44,10 @@ export class BrowserManager {
35
44
  private _configuration: NativeBrowserConfiguration = {}
36
45
  private router = new SimpleRouter()
37
46
 
38
- // Layer resolution: any present request/browse resolver is invoked once per
39
- // content generation, and the resolved TransformableRequestConfig is cached
40
- // and fed into applyLayers in place of the static request/browse config. The
41
- // generation bumps on config-set and on invalidateAllContent().
42
- private _layerGeneration = 0
43
- private _resolvedLayerGeneration = -1
44
- private _resolvedRequest?: TransformableRequestConfig
45
- private _resolvedBrowse?: TransformableRequestConfig
46
- // Dedupes concurrent resolution within a generation (config-set triggers an
47
- // initial navigate that can overlap with an explicit navigatePath), so a
48
- // resolver is invoked exactly once per generation even under concurrency.
49
- private _layerResolution?: { generation: number; promise: Promise<void> }
47
+ // The request and browse layers: each resolver's result, else the static
48
+ // layer, for the current content generation. The generation bumps on
49
+ // config-set and on invalidateAllContent().
50
+ private layers = new GenerationMemo<ResolvedLayers>()
50
51
 
51
52
  // Navigation tracking to prevent race conditions (matches Android's @Volatile currentNavigationId)
52
53
  private currentNavigationId = 0
@@ -159,7 +160,7 @@ export class BrowserManager {
159
160
  */
160
161
  set configuration(value: NativeBrowserConfiguration) {
161
162
  this._configuration = value
162
- this._layerGeneration += 1
163
+ this.layers.invalidate()
163
164
  this.navigationErrorManager.clearNavigationError()
164
165
  this.navigationErrorManager.setFormatCallback(value.formatNavigationError)
165
166
 
@@ -217,7 +218,7 @@ export class BrowserManager {
217
218
  * to re-resolve it.
218
219
  */
219
220
  invalidateAllContent(): void {
220
- this._layerGeneration += 1
221
+ this.layers.invalidate()
221
222
  if (this._path) {
222
223
  void this.navigate(this._path)
223
224
  }
@@ -409,28 +410,12 @@ export class BrowserManager {
409
410
  // meant an app with no `artwork` block never populated the field at all —
410
411
  // `resolveArtworkSourceAsync` already handles the no-config case the way
411
412
  // `resolveArtworkUrl` does on Android.
412
- const artworkConfig = this._configuration.artwork
413
- // The shared request layer applies to artwork too — use the resolved layer
414
- // (resolver result or static config) so a resolver-only config still works.
415
- await this.ensureLayersResolved()
416
- const requestConfig = this._resolvedRequest
417
-
418
413
  // Transform parent artwork
419
- const parentArtworkSource =
420
- await RequestConfigBuilder.resolveArtworkSourceAsync(
421
- content,
422
- requestConfig,
423
- artworkConfig
424
- )
414
+ const parentArtworkSource = await this.resolveArtworkSource(content)
425
415
 
426
416
  // Transform children artwork, section by section
427
417
  const transformTrack = async (track: Track): Promise<Track> => {
428
- const artworkSource =
429
- await RequestConfigBuilder.resolveArtworkSourceAsync(
430
- track,
431
- requestConfig,
432
- artworkConfig
433
- )
418
+ const artworkSource = await this.resolveArtworkSource(track)
434
419
  if (artworkSource && !track.artworkSource) {
435
420
  return { ...track, artworkSource }
436
421
  }
@@ -543,48 +528,43 @@ export class BrowserManager {
543
528
  async resolvedRequestConfig(): Promise<
544
529
  TransformableRequestConfig | undefined
545
530
  > {
546
- await this.ensureLayersResolved()
547
- return this._resolvedRequest
531
+ return (await this.resolvedLayers()).request
548
532
  }
549
533
 
550
534
  /**
551
- * Ensures the request/browse layer configs are resolved for the current
552
- * generation. Any present resolver is invoked once per generation and the
553
- * result cached; a static config (no resolver) passes through unchanged.
535
+ * `track`'s artwork through the resolved request layer and `artworkConfig`,
536
+ * else the `artwork` config. Rejects when the request layer's resolver does.
554
537
  */
555
- private async ensureLayersResolved(): Promise<void> {
556
- if (this._resolvedLayerGeneration === this._layerGeneration) return
557
- // Reuse an in-flight resolution for the same generation so concurrent
558
- // navigations (e.g. config-set's initial navigate overlapping an explicit
559
- // navigatePath) don't each invoke the resolver.
560
- if (this._layerResolution?.generation === this._layerGeneration) {
561
- return this._layerResolution.promise
562
- }
563
- const generation = this._layerGeneration
564
- const promise = (async () => {
538
+ async resolveArtworkSource(
539
+ track: Track,
540
+ imageContext?: ImageContext,
541
+ artworkConfig: ArtworkRequestConfig | undefined = this._configuration
542
+ .artwork
543
+ ): Promise<ImageSource | undefined> {
544
+ return RequestConfigBuilder.resolveArtworkSourceAsync(
545
+ track,
546
+ await this.resolvedRequestConfig(),
547
+ artworkConfig,
548
+ imageContext
549
+ )
550
+ }
551
+
552
+ /**
553
+ * The request and browse layers of the current generation. A resolver runs
554
+ * once per generation, and again for a later caller when it outlasts
555
+ * {@link GenerationMemo}'s bound.
556
+ */
557
+ private resolvedLayers(): Promise<ResolvedLayers> {
558
+ return this.layers.value(async () => {
565
559
  const cfg = this._configuration
566
- const resolvedRequest = cfg.requestResolver
560
+ const request = cfg.requestResolver
567
561
  ? await cfg.requestResolver()
568
562
  : cfg.request
569
- const resolvedBrowse = cfg.browseResolver
563
+ const browse = cfg.browseResolver
570
564
  ? await cfg.browseResolver()
571
565
  : cfg.browse
572
- // Only commit if no newer generation superseded us mid-resolution.
573
- if (this._layerGeneration === generation) {
574
- this._resolvedRequest = resolvedRequest
575
- this._resolvedBrowse = resolvedBrowse
576
- this._resolvedLayerGeneration = generation
577
- }
578
- })().catch((err) => {
579
- // A failed resolution must not wedge the generation — clear the in-flight
580
- // cache so the next navigation retries (e.g. a transient async resolver error).
581
- if (this._layerResolution?.generation === generation) {
582
- this._layerResolution = undefined
583
- }
584
- throw err
566
+ return { request, browse }
585
567
  })
586
- this._layerResolution = { generation, promise }
587
- return promise
588
568
  }
589
569
 
590
570
  /**
@@ -602,13 +582,13 @@ export class BrowserManager {
602
582
  path: string,
603
583
  params: Record<string, string>
604
584
  ): Promise<ResolvedTrack> {
605
- await this.ensureLayersResolved()
585
+ const layers = await this.resolvedLayers()
606
586
  const merged = await RequestConfigBuilder.applyLayers(
607
587
  { path },
608
588
  [
609
- this._resolvedRequest,
589
+ layers.request,
610
590
  // fall back to the route's kind config when no browse layer is configured
611
- this._resolvedBrowse ?? kindConfig,
591
+ layers.browse ?? kindConfig,
612
592
  routeConfig
613
593
  ],
614
594
  params
@@ -629,10 +609,10 @@ export class BrowserManager {
629
609
  searchConfig: TransformableRequestConfig,
630
610
  queryParams: Record<string, string>
631
611
  ): Promise<Track[]> {
632
- await this.ensureLayersResolved()
612
+ const { request } = await this.resolvedLayers()
633
613
  const merged = await RequestConfigBuilder.applyLayers(
634
614
  { path: searchConfig.path, query: queryParams },
635
- [this._resolvedRequest, searchConfig],
615
+ [request, searchConfig],
636
616
  queryParams
637
617
  )
638
618
  const response = await this.httpClient.executeRequest(merged)
@@ -746,18 +726,9 @@ export class BrowserManager {
746
726
  // request layer (incl. its transform) applies, matching content/search.
747
727
  // Gated per track inside the resolver, as on Android — see
748
728
  // `transformArtworkForContent`.
749
- const artworkConfig = this._configuration.artwork
750
- // Resolved request layer (resolver or static), matching content/search.
751
- await this.ensureLayersResolved()
752
- const requestConfig = this._resolvedRequest
753
729
  return Promise.all(
754
730
  tabs.map(async (track) => {
755
- const artworkSource =
756
- await RequestConfigBuilder.resolveArtworkSourceAsync(
757
- track,
758
- requestConfig,
759
- artworkConfig
760
- )
731
+ const artworkSource = await this.resolveArtworkSource(track)
761
732
  if (artworkSource && !track.artworkSource) {
762
733
  return { ...track, artworkSource }
763
734
  }
@@ -1,6 +1,5 @@
1
1
  import type { Track, SearchParams } from '../../types'
2
2
  import type { BrowserManager } from './BrowserManager'
3
- import { RequestConfigBuilder } from '../http/RequestConfigBuilder'
4
3
 
5
4
  /**
6
5
  * Manages search functionality.
@@ -59,16 +58,10 @@ export class SearchManager {
59
58
  // Transform artwork URLs on search results using async method with full Track access
60
59
  // Gated per track inside the resolver, as on Android — a result carrying a
61
60
  // plain `artwork` URL resolves even with no `artwork` config.
62
- const requestConfig = await this.browserManager.resolvedRequestConfig()
63
- const artworkConfig = this.browserManager.configuration.artwork
64
61
  results = await Promise.all(
65
62
  results.map(async (track) => {
66
63
  const artworkSource =
67
- await RequestConfigBuilder.resolveArtworkSourceAsync(
68
- track,
69
- requestConfig,
70
- artworkConfig
71
- )
64
+ await this.browserManager.resolveArtworkSource(track)
72
65
  if (artworkSource && !track.artworkSource) {
73
66
  return { ...track, artworkSource }
74
67
  }
@@ -115,3 +115,36 @@ describe('artwork resolution without an artwork config', () => {
115
115
  expect(tile?.artworkSource).toBeUndefined()
116
116
  })
117
117
  })
118
+
119
+ describe('artwork resolution with nowPlayingArtwork set', () => {
120
+ it('resolves browse artwork through the artwork config alone', async () => {
121
+ const manager = makeManager()
122
+ manager.configuration = {
123
+ path: '/',
124
+ artwork: { baseUrl: 'https://img.example.com' },
125
+ nowPlayingArtwork: { baseUrl: 'https://np.example.com' },
126
+ routes: [
127
+ {
128
+ path: '/library',
129
+ browseStatic: {
130
+ path: '/library',
131
+ title: 'Library',
132
+ sections: [
133
+ {
134
+ title: 'Collections',
135
+ children: [
136
+ { title: 'Seven', path: '/7', artwork: '/art/7.jpg' }
137
+ ]
138
+ }
139
+ ]
140
+ }
141
+ }
142
+ ]
143
+ }
144
+
145
+ await manager.navigatePath('/library')
146
+
147
+ const tile = manager.content?.sections?.[0]?.children[0]
148
+ expect(tile?.artworkSource?.uri).toBe('https://img.example.com/art/7.jpg')
149
+ })
150
+ })
@@ -1,4 +1,6 @@
1
- import { describe, it, expect, vi } from 'vitest'
1
+ import type { MockInstance } from 'vitest'
2
+ import { afterEach, beforeEach, describe, it, expect, vi } from 'vitest'
3
+ import type { TransformableRequestConfig } from '../../../types'
2
4
  import type { HttpClient } from '../../http/HttpClient'
3
5
  import { BrowserManager } from '../BrowserManager'
4
6
  import { FavoriteManager } from '../FavoriteManager'
@@ -101,4 +103,48 @@ describe('BrowserManager layer resolver', () => {
101
103
  baseUrl: 'https://static.example.com'
102
104
  })
103
105
  })
106
+
107
+ describe('a resolver that stays silent', () => {
108
+ let now: MockInstance<() => number>
109
+ beforeEach(() => {
110
+ now = vi.spyOn(performance, 'now').mockReturnValue(0)
111
+ })
112
+ afterEach(() => now.mockRestore())
113
+
114
+ it('is called again by a request past the bound', async () => {
115
+ const answers = [
116
+ new Promise<never>(() => {}),
117
+ Promise.resolve({ baseUrl: 'https://late.example.com' })
118
+ ]
119
+ const manager = makeManager()
120
+ manager.configuration = {
121
+ path: '/',
122
+ requestResolver: () => answers.shift() ?? new Promise<never>(() => {})
123
+ }
124
+ void manager.resolvedRequestConfig()
125
+ await new Promise((resolve) => setTimeout(resolve, 0))
126
+ now.mockReturnValue(10_000)
127
+ expect(await manager.resolvedRequestConfig()).toEqual({
128
+ baseUrl: 'https://late.example.com'
129
+ })
130
+ })
131
+ })
132
+
133
+ it('never hands a request the layer of a configuration it replaced', async () => {
134
+ const answers: Array<(config: TransformableRequestConfig) => void> = []
135
+ const requestResolver = () =>
136
+ new Promise<TransformableRequestConfig>((resolve) =>
137
+ answers.push(resolve)
138
+ )
139
+ const manager = makeManager()
140
+ manager.configuration = { path: '/', requestResolver }
141
+ const pending = manager.resolvedRequestConfig()
142
+ await new Promise((resolve) => setTimeout(resolve, 0))
143
+ manager.configuration = { path: '/', requestResolver }
144
+ await new Promise((resolve) => setTimeout(resolve, 0))
145
+ answers[0]!({ baseUrl: 'https://old.example.com' })
146
+ await new Promise((resolve) => setTimeout(resolve, 0))
147
+ answers[1]!({ baseUrl: 'https://new.example.com' })
148
+ expect(await pending).toEqual({ baseUrl: 'https://new.example.com' })
149
+ })
104
150
  })