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.
Files changed (239) 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 +41 -6
  3. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +210 -125
  5. package/android/src/main/java/com/audiobrowser/browser/FavoriteChange.kt +61 -0
  6. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
  7. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
  8. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +2 -0
  9. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +2 -0
  10. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -1
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
  12. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +2 -0
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +55 -26
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +168 -51
  15. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +19 -8
  16. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
  17. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
  18. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
  19. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
  20. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
  21. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
  22. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
  23. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
  24. package/android/src/main/res/values/strings.xml +5 -2
  25. package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
  26. package/android/src/test/java/com/audiobrowser/ConfigurationStartTest.kt +72 -0
  27. package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
  28. package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
  29. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
  30. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
  31. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
  32. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +58 -0
  33. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +15 -0
  34. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
  35. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
  36. package/android/src/test/java/com/audiobrowser/browser/FavoriteChangeTest.kt +106 -0
  37. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
  38. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -0
  39. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +8 -19
  40. package/android/src/test/java/com/audiobrowser/player/FavoriteRestampTest.kt +117 -0
  41. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
  42. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -0
  43. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +58 -1
  44. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
  45. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
  46. package/android/src/test/java/com/audiobrowser/player/QueueEventOnSessionPlayersTest.kt +40 -0
  47. package/android/src/test/java/com/audiobrowser/player/QueueEventTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/player/QueueItemPickTest.kt +130 -0
  49. package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
  50. package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
  51. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
  52. package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
  53. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +26 -0
  54. package/android/src/test/java/com/audiobrowser/player/TabsChangedTest.kt +81 -0
  55. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
  56. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
  57. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
  58. package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
  59. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
  60. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
  61. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
  62. package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
  63. package/ios/AVPlayerEngine.swift +2 -2
  64. package/ios/Browser/BrowserPathHelper.swift +11 -9
  65. package/ios/Browser/PageResolver.swift +1 -1
  66. package/ios/CarPlay/CarPlayListItemFactory.swift +2 -2
  67. package/ios/CarPlay/CarPlayNowPlayingManager.swift +64 -31
  68. package/ios/CarPlay/NowPlayingButtonRules.swift +26 -0
  69. package/ios/CarPlay/SectionPresentation.swift +7 -0
  70. package/ios/Extension/Promise+AwaitCallback.swift +13 -4
  71. package/ios/HybridAudioBrowser+Player.swift +3 -2
  72. package/ios/HybridAudioBrowser.swift +1 -1
  73. package/ios/Model/NitroTypeStubs.swift +15 -0
  74. package/ios/Model/PlayerUpdateOptions.swift +2 -1
  75. package/ios/PlaybackEvent.swift +20 -0
  76. package/ios/Player/Player.swift +17 -3
  77. package/ios/Player/QueueManager.swift +23 -41
  78. package/ios/Tests/AwaitCallbackTests.swift +8 -0
  79. package/ios/Tests/BrowserPathHelperTests.swift +18 -0
  80. package/ios/Tests/CapabilityRemoteCommandTests.swift +4 -0
  81. package/ios/Tests/DataURLDecodingTests.swift +25 -0
  82. package/ios/Tests/GenerationMemoTests.swift +136 -0
  83. package/ios/Tests/JSCallbackErrorTests.swift +33 -0
  84. package/ios/Tests/NowPlayingButtonRulesTests.swift +35 -0
  85. package/ios/Tests/PlaybackStateMachineTests.swift +15 -0
  86. package/ios/Tests/PlayerPolicyTests.swift +51 -28
  87. package/ios/Tests/PlayerProgressTests.swift +0 -2
  88. package/ios/Tests/PlayerTests.swift +54 -0
  89. package/ios/Tests/QueueManagerTests.swift +111 -78
  90. package/ios/Tests/RequestLayerTests.swift +11 -0
  91. package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
  92. package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
  93. package/ios/Tests/SectionPresentationTests.swift +13 -0
  94. package/ios/Tests/Support/TestTypes.swift +23 -1
  95. package/ios/Util/ArtworkImageFetcher.swift +40 -16
  96. package/ios/Util/AwaitCallback.swift +16 -10
  97. package/ios/Util/GenerationMemo.swift +81 -17
  98. package/ios/Util/JSCallbackError.swift +23 -0
  99. package/ios/Util/OutputPicker.swift +25 -5
  100. package/ios/Util/RoutePickerSourceFrame.swift +17 -0
  101. package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
  102. package/lib/commonjs/features/browser-config.js +3 -2
  103. package/lib/commonjs/features/browser-config.js.map +1 -1
  104. package/lib/commonjs/features/browser.js +7 -8
  105. package/lib/commonjs/features/browser.js.map +1 -1
  106. package/lib/commonjs/features/output.js +7 -3
  107. package/lib/commonjs/features/output.js.map +1 -1
  108. package/lib/commonjs/features/player/options.js.map +1 -1
  109. package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
  110. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  111. package/lib/commonjs/web/browser/BrowserManager.js +37 -65
  112. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/SearchManager.js +1 -4
  114. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  115. package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
  116. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  117. package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
  118. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  119. package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
  120. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  121. package/lib/commonjs/web/util/GenerationMemo.js +92 -0
  122. package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
  123. package/lib/module/features/browser-config.js +3 -2
  124. package/lib/module/features/browser-config.js.map +1 -1
  125. package/lib/module/features/browser.js +7 -8
  126. package/lib/module/features/browser.js.map +1 -1
  127. package/lib/module/features/output.js +7 -3
  128. package/lib/module/features/output.js.map +1 -1
  129. package/lib/module/features/player/options.js.map +1 -1
  130. package/lib/module/web/NativeAudioBrowser.js +43 -2
  131. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  132. package/lib/module/web/browser/BrowserManager.js +37 -66
  133. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  134. package/lib/module/web/browser/SearchManager.js +1 -5
  135. package/lib/module/web/browser/SearchManager.js.map +1 -1
  136. package/lib/module/web/http/RequestConfigBuilder.js +53 -55
  137. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  138. package/lib/module/web/player/NowPlayingManager.js +3 -22
  139. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  140. package/lib/module/web/util/BrowserPathHelper.js +5 -7
  141. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  142. package/lib/module/web/util/GenerationMemo.js +87 -0
  143. package/lib/module/web/util/GenerationMemo.js.map +1 -0
  144. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  145. package/lib/typescript/src/features/browser.d.ts +7 -8
  146. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  147. package/lib/typescript/src/features/output.d.ts +8 -4
  148. package/lib/typescript/src/features/output.d.ts.map +1 -1
  149. package/lib/typescript/src/features/player/options.d.ts +19 -1
  150. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  151. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
  152. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  153. package/lib/typescript/src/types/browser-native.d.ts +2 -1
  154. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  155. package/lib/typescript/src/types/browser.d.ts +55 -8
  156. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  157. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  158. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
  159. package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
  160. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
  161. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
  162. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
  163. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
  164. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
  165. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
  166. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
  167. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
  168. 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
  169. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
  170. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
  171. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
  172. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
  173. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
  174. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
  175. 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
  176. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
  177. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  178. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
  179. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
  180. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
  181. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
  182. package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
  183. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -1
  184. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
  185. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
  186. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
  187. 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
  188. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  189. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
  190. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
  191. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +7 -2
  192. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
  193. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
  194. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
  195. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
  196. package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
  197. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
  198. package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
  199. package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
  200. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  201. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  202. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
  203. package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
  204. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +19 -1
  205. package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
  206. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
  207. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
  208. package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
  209. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +5 -1
  210. package/package.json +1 -1
  211. package/src/codegen-js-error-message.test.ts +78 -0
  212. package/src/features/browser-config.test.ts +7 -0
  213. package/src/features/browser-config.ts +3 -2
  214. package/src/features/browser.ts +7 -8
  215. package/src/features/output.ts +13 -5
  216. package/src/features/player/options.ts +19 -1
  217. package/src/specs/audio-browser.nitro.ts +16 -3
  218. package/src/types/browser-native.ts +4 -1
  219. package/src/types/browser.ts +60 -8
  220. package/src/web/NativeAudioBrowser.ts +43 -3
  221. package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
  222. package/src/web/browser/BrowserManager.ts +50 -79
  223. package/src/web/browser/SearchManager.ts +1 -8
  224. package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
  225. package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
  226. package/src/web/http/RequestConfigBuilder.test.ts +151 -1
  227. package/src/web/http/RequestConfigBuilder.ts +72 -57
  228. package/src/web/player/NowPlayingManager.test.ts +29 -0
  229. package/src/web/player/NowPlayingManager.ts +4 -27
  230. package/src/web/util/BrowserPathHelper.test.ts +23 -0
  231. package/src/web/util/BrowserPathHelper.ts +6 -7
  232. package/src/web/util/GenerationMemo.test.ts +148 -0
  233. package/src/web/util/GenerationMemo.ts +103 -0
  234. package/website/guide/audio-output.md +34 -7
  235. package/website/guide/browser.md +21 -0
  236. package/website/guide/carplay.md +1 -1
  237. package/website/guide/configuration.md +10 -9
  238. package/website/guide/gate.md +1 -1
  239. package/website/guide/remote-controls.md +35 -0
@@ -1,4 +1,4 @@
1
- import { describe, it, expect } from 'vitest'
1
+ import { describe, it, expect, vi } from 'vitest'
2
2
  import type {
3
3
  RequestConfig,
4
4
  Track,
@@ -85,6 +85,132 @@ describe('RequestConfigBuilder.applyLayer — sync/async transform composition',
85
85
  })
86
86
  })
87
87
 
88
+ describe('RequestConfigBuilder.resolveArtworkSourceAsync — no path left', () => {
89
+ it('gives no artwork when a transform drops the path', async () => {
90
+ const out = await RequestConfigBuilder.resolveArtworkSourceAsync(
91
+ { title: 'T', artwork: '/art/7.jpg' } as Track,
92
+ undefined,
93
+ { transform: () => Promise.resolve({ baseUrl: 'https://x.example.com' }) }
94
+ )
95
+
96
+ expect(out).toBeUndefined()
97
+ })
98
+
99
+ it('gives no artwork for a track without artwork under a baseUrl-only config', async () => {
100
+ const out = await RequestConfigBuilder.resolveArtworkSourceAsync(
101
+ { title: 'T' } as Track,
102
+ undefined,
103
+ { baseUrl: 'https://img.example.com' }
104
+ )
105
+
106
+ expect(out).toBeUndefined()
107
+ })
108
+ })
109
+
110
+ describe('RequestConfigBuilder.transformTrackArtwork', () => {
111
+ it("appends the request and artwork layers' query", () => {
112
+ const track = { title: 'T', artwork: '/art/7.jpg' } as Track
113
+ const out = RequestConfigBuilder.transformTrackArtwork(
114
+ track,
115
+ { baseUrl: 'https://img.example.com', query: { key: 'k' } },
116
+ { query: { v: '2' } }
117
+ )
118
+
119
+ expect(out.artworkSource?.uri).toBe(
120
+ 'https://img.example.com/art/7.jpg?key=k&v=2'
121
+ )
122
+ })
123
+
124
+ it('leaves the artwork as it is without an artwork config', () => {
125
+ const track = { title: 'T', artwork: 'https://cdn.example.com/a.jpg' }
126
+ const out = RequestConfigBuilder.transformTrackArtwork(
127
+ track as Track,
128
+ { baseUrl: 'https://api.example.com', query: { key: 'k' } },
129
+ undefined
130
+ )
131
+
132
+ expect(out.artworkSource?.uri).toBe('https://cdn.example.com/a.jpg')
133
+ })
134
+ })
135
+
136
+ describe('RequestConfigBuilder — {id} in an artwork config', () => {
137
+ const track = { id: 'abc', title: 'T', artwork: '/art.jpg' } as Track
138
+
139
+ it("fills {id} with the track's id in the path, query and headers", async () => {
140
+ const out = await RequestConfigBuilder.resolveArtworkSourceAsync(
141
+ track,
142
+ { baseUrl: 'https://img.example.com' },
143
+ {
144
+ path: '/artwork/{id}',
145
+ query: { track: '{id}' },
146
+ headers: { 'x-track': '{id}' }
147
+ }
148
+ )
149
+
150
+ expect(out?.uri).toBe('https://img.example.com/artwork/abc?track=abc')
151
+ expect(out?.headers).toEqual({ 'x-track': 'abc' })
152
+ })
153
+
154
+ it('fills {id} a transform puts in', async () => {
155
+ const out = await RequestConfigBuilder.resolveArtworkSourceAsync(
156
+ track,
157
+ undefined,
158
+ {
159
+ transform: ({ request }) =>
160
+ Promise.resolve({ ...request, path: '/{id}.png' })
161
+ }
162
+ )
163
+
164
+ expect(out?.uri).toBe('/abc.png')
165
+ })
166
+
167
+ it('leaves {id} in place, and warns, for a track without an id', async () => {
168
+ using warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
169
+ const out = await RequestConfigBuilder.resolveArtworkSourceAsync(
170
+ { ...track, id: undefined },
171
+ undefined,
172
+ { baseUrl: 'https://img.example.com', path: '/artwork/{id}' }
173
+ )
174
+
175
+ expect(out?.uri).toBe('https://img.example.com/artwork/{id}')
176
+ expect(warn).toHaveBeenCalledOnce()
177
+ })
178
+
179
+ it("resolves a queued track's artwork from the config's path when the track has none", () => {
180
+ const out = RequestConfigBuilder.transformTrackArtwork(
181
+ { id: 'abc', title: 'T' } as Track,
182
+ undefined,
183
+ { baseUrl: 'https://img.example.com', path: '/artwork/{id}' }
184
+ )
185
+
186
+ expect(out.artworkSource?.uri).toBe('https://img.example.com/artwork/abc')
187
+ })
188
+
189
+ it("fills {id} in a queued track's artworkSource", () => {
190
+ const out = RequestConfigBuilder.transformTrackArtwork(track, undefined, {
191
+ baseUrl: 'https://img.example.com',
192
+ path: '/artwork/{id}'
193
+ })
194
+
195
+ expect(out.artworkSource?.uri).toBe('https://img.example.com/artwork/abc')
196
+ })
197
+ })
198
+
199
+ describe('RequestConfigBuilder — data: URLs', () => {
200
+ const dataUrl = 'data:image/png;base64,iVBORw0KGgo='
201
+
202
+ it('leaves the query of the request and artwork layers off data: artwork', async () => {
203
+ const track = { title: 'T', artwork: dataUrl } as Track
204
+ const out = await RequestConfigBuilder.resolveArtworkSourceAsync(
205
+ track,
206
+ { query: { key: 'k' } },
207
+ { query: { v: '2' } }
208
+ )
209
+
210
+ expect(out?.uri).toBe(dataUrl)
211
+ })
212
+ })
213
+
88
214
  /**
89
215
  * A media request needs more than its URL. The layers resolve headers (and a
90
216
  * user agent) alongside it, and native applies them to the AVURLAsset /
@@ -144,6 +270,17 @@ describe('RequestConfigBuilder.resolveMediaRequest', () => {
144
270
  expect(out.baseUrl).toBeUndefined()
145
271
  })
146
272
 
273
+ it('leaves a blob src out of the shared baseUrl', async () => {
274
+ const blob = 'blob:https://app.example.com/0b1c2d3e'
275
+ const out = await RequestConfigBuilder.resolveMediaRequest(
276
+ blob,
277
+ { baseUrl: 'https://api.example.com' },
278
+ undefined
279
+ )
280
+
281
+ expect(out.path).toBe(blob)
282
+ })
283
+
147
284
  it('carries the media config query onto the resolved url', async () => {
148
285
  const out = await RequestConfigBuilder.resolveMediaRequest(src, undefined, {
149
286
  query: { token: 'abc' }
@@ -297,3 +434,16 @@ describe('RequestConfigBuilder.resolveMediaRequest — media.resolve', () => {
297
434
  expect(out.path).toBe(src)
298
435
  })
299
436
  })
437
+
438
+ describe('RequestConfigBuilder.resolveArtworkSource', () => {
439
+ it('leaves a data artwork URL out of the artwork baseUrl', () => {
440
+ const data = 'data:image/png;base64,iVBORw0KGgo='
441
+ const out = RequestConfigBuilder.resolveArtworkSource(
442
+ { title: 'T', artwork: data } as Track,
443
+ undefined,
444
+ { baseUrl: 'https://img.example.com' }
445
+ )
446
+
447
+ expect(out?.uri).toBe(data)
448
+ })
449
+ })
@@ -12,13 +12,16 @@ import { artworkUrl as resolveArtworkUrl } from '../../utils/artwork'
12
12
  import { BrowserPathHelper } from '../util/BrowserPathHelper'
13
13
 
14
14
  /**
15
- * Appends query parameters to a URL, handling existing query strings.
15
+ * Appends query parameters to a URL, handling existing query strings. A
16
+ * `data:` URL comes back unchanged: what follows its comma is the payload.
16
17
  */
17
18
  function appendQueryParams(
18
19
  url: string,
19
20
  query: Record<string, string | undefined> | undefined
20
21
  ): string {
21
- if (!query || Object.keys(query).length === 0) return url
22
+ if (!query || Object.keys(query).length === 0 || /^data:/i.test(url)) {
23
+ return url
24
+ }
22
25
 
23
26
  const params = new URLSearchParams()
24
27
  for (const [key, value] of Object.entries(query)) {
@@ -56,6 +59,56 @@ function applyImageQueryParams(
56
59
  return { ...config, query }
57
60
  }
58
61
 
62
+ const TRACK_ID_TOKEN = '{id}'
63
+
64
+ function unconfiguredArtworkSource(
65
+ artworkUrl: string | undefined
66
+ ): ImageSource | undefined {
67
+ return artworkUrl ? { uri: artworkUrl, method: 'GET' } : undefined
68
+ }
69
+
70
+ /**
71
+ * The image source a finished artwork request loads, with `{id}` in its path,
72
+ * query and headers replaced by `id`. Without a non-empty `id` the token
73
+ * stays, so the request fails with a URL that says why, and a warning names
74
+ * it. Undefined when the request has no path.
75
+ */
76
+ function artworkImageSource(
77
+ request: RequestConfig,
78
+ id: string | undefined
79
+ ): ImageSource | undefined {
80
+ const fill = (value: string) =>
81
+ id ? value.split(TRACK_ID_TOKEN).join(id) : value
82
+ const fillValues = (values: Record<string, string> | undefined) =>
83
+ values &&
84
+ Object.fromEntries(
85
+ Object.entries(values).map(([key, value]) => [key, fill(value)])
86
+ )
87
+ if (request.path === undefined) return undefined
88
+ const filled: RequestConfig = {
89
+ ...request,
90
+ path: fill(request.path),
91
+ query: fillValues(request.query),
92
+ headers: fillValues(request.headers)
93
+ }
94
+ const uri = RequestConfigBuilder.buildUrl(filled)
95
+ if (
96
+ [
97
+ filled.path,
98
+ ...Object.values(filled.query ?? {}),
99
+ ...Object.values(filled.headers ?? {})
100
+ ].some((value) => value?.includes(TRACK_ID_TOKEN))
101
+ ) {
102
+ console.warn(`Artwork: track has no id, '{id}' left unfilled in ${uri}`)
103
+ }
104
+ return {
105
+ uri,
106
+ method: filled.method ?? 'GET',
107
+ headers: filled.headers,
108
+ body: filled.body
109
+ }
110
+ }
111
+
59
112
  /** Whether `after` carries a header `before` had not already set identically. */
60
113
  function addsHeaders(
61
114
  before: Record<string, string> | undefined,
@@ -320,49 +373,31 @@ export const RequestConfigBuilder = {
320
373
  },
321
374
 
322
375
  /**
323
- * Resolves an artwork URL and creates an ImageSource.
324
- * Matches Android's artwork URL transformation behavior.
376
+ * `track`'s artwork through the static fields of the shared `request` layer
377
+ * and the `artwork` config: the async resolution without the request
378
+ * layer's transform, the config's resolvers and transforms, or a size.
325
379
  *
326
- * The shared `request` layer's static fields are applied first; this sync path
327
- * cannot run an async `request.transform`, so transform-based shaping (e.g. a
328
- * dynamic baseUrl) only applies on the async resolution paths. Queue tracks
329
- * usually already carry an `artworkSource` resolved at browse-time, so this
330
- * sync fallback rarely runs.
331
- *
332
- * @param artworkUrl The artwork URL (may be relative or absolute)
380
+ * @param track The track whose `artwork` (relative or absolute) to resolve
333
381
  * @param requestConfig The shared request configuration (static fields only)
334
382
  * @param artworkConfig The artwork request configuration
335
383
  * @returns ImageSource with resolved URI, or undefined if no artwork
336
384
  */
337
385
  resolveArtworkSource(
338
- artworkUrl: string | undefined,
386
+ track: Track,
339
387
  requestConfig: TransformableRequestConfig | undefined,
340
388
  artworkConfig: ArtworkRequestConfig | undefined
341
389
  ): ImageSource | undefined {
342
- if (!artworkUrl) return undefined
343
-
344
- // Base path stays the artwork URL; the request layer contributes baseUrl /
345
- // query / headers, then the artwork config overrides on top.
346
- let config: RequestConfig = { path: artworkUrl }
347
- if (requestConfig) {
348
- config = this.mergeConfig(this.toRequestConfig(requestConfig), {
349
- path: artworkUrl
350
- })
351
- }
352
- if (artworkConfig) {
353
- config = this.mergeConfig(config, this.toRequestConfig(artworkConfig))
354
- }
355
-
356
- const resolvedUri = BrowserPathHelper.buildUrl(
357
- config.baseUrl,
358
- config.path ?? artworkUrl
359
- )
390
+ const artworkUrl = resolveArtworkUrl(track.artwork)
391
+ if (!artworkConfig) return unconfiguredArtworkSource(artworkUrl)
360
392
 
361
- return {
362
- uri: resolvedUri,
363
- method: config.method ?? 'GET',
364
- headers: config.headers
393
+ const base = {
394
+ ...this.toRequestConfig(requestConfig ?? {}),
395
+ path: artworkUrl
365
396
  }
397
+ return artworkImageSource(
398
+ this.mergeConfig(base, this.toRequestConfig(artworkConfig)),
399
+ track.id
400
+ )
366
401
  },
367
402
 
368
403
  /**
@@ -393,15 +428,7 @@ export const RequestConfigBuilder = {
393
428
  // single `ImageSource`, and the web fallback renders one <Image>.
394
429
  const artworkUrl = resolveArtworkUrl(track.artwork)
395
430
 
396
- // If no config and no track.artwork, nothing to transform
397
- if (!artworkConfig && !artworkUrl) {
398
- return undefined
399
- }
400
-
401
- // If no artwork config, just return the original artwork URL
402
- if (!artworkConfig) {
403
- return artworkUrl ? { uri: artworkUrl, method: 'GET' } : undefined
404
- }
431
+ if (!artworkConfig) return unconfiguredArtworkSource(artworkUrl)
405
432
 
406
433
  try {
407
434
  // Step 0: Apply the shared request layer, with track.artwork as the path.
@@ -450,19 +477,7 @@ export const RequestConfigBuilder = {
450
477
  })
451
478
  }
452
479
 
453
- // Build final URL
454
- const resolvedUri = BrowserPathHelper.buildUrl(
455
- mergedConfig.baseUrl,
456
- mergedConfig.path ?? artworkUrl ?? ''
457
- )
458
- const finalUri = appendQueryParams(resolvedUri, mergedConfig.query)
459
-
460
- return {
461
- uri: finalUri,
462
- method: mergedConfig.method ?? 'GET',
463
- headers: mergedConfig.headers,
464
- body: mergedConfig.body
465
- }
480
+ return artworkImageSource(mergedConfig, track.id)
466
481
  } catch (error) {
467
482
  // resolve/transform threw - log error, return undefined to avoid broken images
468
483
  console.error('Failed to resolve artwork URL:', error)
@@ -489,7 +504,7 @@ export const RequestConfigBuilder = {
489
504
  if (track.artworkSource) return track
490
505
 
491
506
  const artworkSource = this.resolveArtworkSource(
492
- resolveArtworkUrl(track.artwork),
507
+ track,
493
508
  requestConfig,
494
509
  artworkConfig
495
510
  )
@@ -43,4 +43,33 @@ describe('NowPlayingManager', () => {
43
43
  album: 'Track Album'
44
44
  })
45
45
  })
46
+
47
+ it("gives the track's artworkSource as its artwork, as iOS does", () => {
48
+ const manager = new NowPlayingManager()
49
+ let pushed
50
+ manager.onNowPlayingChanged = (metadata) => {
51
+ pushed = metadata
52
+ }
53
+ const withSource: Track = {
54
+ ...track,
55
+ artwork: '/art/7.jpg',
56
+ artworkSource: { uri: 'https://img.example.com/art/7.jpg?v=2' }
57
+ }
58
+
59
+ manager.updateNowPlaying({ title: 'Live Title' }, withSource, 0)
60
+
61
+ const uri = 'https://img.example.com/art/7.jpg?v=2'
62
+ expect(pushed).toMatchObject({ artwork: uri })
63
+ expect(manager.getNowPlaying(withSource, 0)).toMatchObject({
64
+ artwork: uri
65
+ })
66
+ })
67
+
68
+ it('gives the raw artwork when the track has no artworkSource', () => {
69
+ const manager = new NowPlayingManager()
70
+
71
+ expect(
72
+ manager.getNowPlaying({ ...track, artwork: '/art/7.jpg' }, 0)
73
+ ).toMatchObject({ artwork: '/art/7.jpg' })
74
+ })
46
75
  })
@@ -28,32 +28,8 @@ export class NowPlayingManager {
28
28
  duration: number
29
29
  ): void {
30
30
  this.override = update
31
-
32
- if (!currentTrack) return
33
-
34
- const metadata: NowPlayingMetadata = update
35
- ? {
36
- title: update.title ?? currentTrack.title,
37
- artist: update.artist ?? currentTrack.artist,
38
- album: update.album ?? currentTrack.album,
39
- artwork: artworkUrl(currentTrack.artwork),
40
- description: currentTrack.description,
41
- mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
42
- genre: currentTrack.genre,
43
- duration
44
- }
45
- : {
46
- title: currentTrack.title,
47
- artist: currentTrack.artist,
48
- album: currentTrack.album,
49
- artwork: artworkUrl(currentTrack.artwork),
50
- description: currentTrack.description,
51
- mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
52
- genre: currentTrack.genre,
53
- duration
54
- }
55
-
56
- this.onNowPlayingChanged(metadata)
31
+ const metadata = this.getNowPlaying(currentTrack, duration)
32
+ if (metadata) this.onNowPlayingChanged(metadata)
57
33
  }
58
34
 
59
35
  /**
@@ -73,7 +49,8 @@ export class NowPlayingManager {
73
49
  title: this.override?.title ?? currentTrack.title,
74
50
  artist: this.override?.artist ?? currentTrack.artist,
75
51
  album: this.override?.album ?? currentTrack.album,
76
- artwork: artworkUrl(currentTrack.artwork),
52
+ artwork:
53
+ currentTrack.artworkSource?.uri ?? artworkUrl(currentTrack.artwork),
77
54
  description: currentTrack.description,
78
55
  mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
79
56
  genre: currentTrack.genre,
@@ -66,3 +66,26 @@ describe('BrowserPathHelper.navigationErrorKind', () => {
66
66
  )
67
67
  })
68
68
  })
69
+
70
+ describe('BrowserPathHelper.buildUrl', () => {
71
+ const base = 'https://api.example.com'
72
+
73
+ it('keeps a path with a colon after its first slash relative', () => {
74
+ expect(BrowserPathHelper.buildUrl(base, '/shows/a:b')).toBe(
75
+ `${base}/shows/a:b`
76
+ )
77
+ expect(BrowserPathHelper.buildUrl(base, 'shows/a:b')).toBe(
78
+ `${base}/shows/a:b`
79
+ )
80
+ })
81
+
82
+ it.each([
83
+ 'HTTPS://other.example.com/a.mp3',
84
+ 'blob:https://app.example.com/0b1c2d3e',
85
+ 'data:image/png;base64,iVBORw0KGgo=',
86
+ 'file:///music/a.mp3',
87
+ '//cdn.example.com/a.mp3'
88
+ ])('returns %s without the base', (url) => {
89
+ expect(BrowserPathHelper.buildUrl(base, url)).toBe(url)
90
+ })
91
+ })
@@ -1,5 +1,8 @@
1
1
  import type { NavigationErrorKind } from '../../types/browser'
2
2
 
3
+ const isAbsoluteUrl = (url: string): boolean =>
4
+ /^([a-z][a-z\d+.-]*:|\/\/)/i.test(url)
5
+
3
6
  /**
4
7
  * Utility for handling browser paths and contextual URLs in the media browser system.
5
8
  * Mirrors Android's BrowserPathHelper.kt
@@ -183,15 +186,11 @@ export const BrowserPathHelper = {
183
186
  * - buildUrl("http://example.com/", "/api/test") → "http://example.com/api/test"
184
187
  * - buildUrl(undefined, "/api/test") → "/api/test"
185
188
  * - buildUrl(undefined, "http://full.url") → "http://full.url"
189
+ * - buildUrl("http://example.com", "blob:http://app/id") → "blob:http://app/id"
190
+ * - buildUrl("http://example.com", "//cdn.example.com/a") → "//cdn.example.com/a"
186
191
  */
187
192
  buildUrl(baseUrl: string | undefined, path: string): string {
188
- // If path is already a full URL, return it as-is
189
- if (path.startsWith('http://') || path.startsWith('https://')) {
190
- return path
191
- }
192
-
193
- // If no baseUrl, return path as-is
194
- if (!baseUrl) {
193
+ if (!baseUrl || isAbsoluteUrl(path)) {
195
194
  return path
196
195
  }
197
196
 
@@ -0,0 +1,148 @@
1
+ import { describe, expect, it } from 'vitest'
2
+ import { GenerationMemo } from './GenerationMemo'
3
+
4
+ /** Computations that each wait until settled on their own, numbered from 0 in start order. */
5
+ function runs() {
6
+ const pending: Array<{
7
+ resolve: (value: number) => void
8
+ reject: (error: Error) => void
9
+ }> = []
10
+ return {
11
+ compute: () =>
12
+ new Promise<number>((resolve, reject) =>
13
+ pending.push({ resolve, reject })
14
+ ),
15
+ get count() {
16
+ return pending.length
17
+ },
18
+ resolve: (index: number, value: number) => pending[index]!.resolve(value),
19
+ reject: (index: number, error: Error) => pending[index]!.reject(error)
20
+ }
21
+ }
22
+
23
+ const settle = () => new Promise((resolve) => setTimeout(resolve, 0))
24
+
25
+ function memoAt() {
26
+ const clock = { now: 0 }
27
+ return { memo: new GenerationMemo<number>(10_000, () => clock.now), clock }
28
+ }
29
+
30
+ describe('GenerationMemo', () => {
31
+ it('shares one run between concurrent callers and keeps its value', async () => {
32
+ const { memo } = memoAt()
33
+ const r = runs()
34
+ const first = memo.value(r.compute)
35
+ const second = memo.value(r.compute)
36
+ await settle()
37
+ r.resolve(0, 1)
38
+ expect(await first).toBe(1)
39
+ expect(await second).toBe(1)
40
+ expect(await memo.value(async () => 2)).toBe(1)
41
+ expect(r.count).toBe(1)
42
+ })
43
+
44
+ it('computes again after invalidate', async () => {
45
+ const { memo } = memoAt()
46
+ await memo.value(async () => 1)
47
+ memo.invalidate()
48
+ expect(await memo.value(async () => 2)).toBe(2)
49
+ })
50
+
51
+ it('does not keep a failure', async () => {
52
+ const { memo } = memoAt()
53
+ await expect(
54
+ memo.value(async () => {
55
+ throw new Error('failed')
56
+ })
57
+ ).rejects.toThrow('failed')
58
+ expect(await memo.value(async () => 3)).toBe(3)
59
+ })
60
+
61
+ it('computes again when a value lands after an invalidation', async () => {
62
+ const { memo } = memoAt()
63
+ let input = 1
64
+ const r = runs()
65
+ const result = memo.value(async () => (await r.compute()) + input)
66
+ await settle()
67
+ input = 10
68
+ memo.invalidate()
69
+ r.resolve(0, 0)
70
+ await settle()
71
+ r.resolve(1, 0)
72
+ expect(await result).toBe(10)
73
+ })
74
+
75
+ it('is joined by a caller within the bound', async () => {
76
+ const { memo, clock } = memoAt()
77
+ const r = runs()
78
+ const early = memo.value(r.compute)
79
+ await settle()
80
+ clock.now = 9_999
81
+ const late = memo.value(r.compute)
82
+ await settle()
83
+ expect(r.count).toBe(1)
84
+ r.resolve(0, 1)
85
+ expect(await late).toBe(1)
86
+ expect(await early).toBe(1)
87
+ })
88
+
89
+ it('is not joined past the bound, and the next value releases every caller', async () => {
90
+ const { memo, clock } = memoAt()
91
+ const r = runs()
92
+ const early = memo.value(r.compute)
93
+ await settle()
94
+ clock.now = 10_000
95
+ const late = memo.value(r.compute)
96
+ await settle()
97
+ expect(r.count).toBe(2)
98
+ r.resolve(1, 2)
99
+ expect(await late).toBe(2)
100
+ expect(await early).toBe(2)
101
+ r.resolve(0, 1)
102
+ await settle()
103
+ expect(await memo.value(async () => 3)).toBe(2)
104
+ })
105
+
106
+ it('counts the bound from the newest run', async () => {
107
+ const { memo, clock } = memoAt()
108
+ const r = runs()
109
+ void memo.value(r.compute)
110
+ await settle()
111
+ clock.now = 10_000
112
+ void memo.value(r.compute)
113
+ await settle()
114
+ clock.now = 15_000
115
+ const third = memo.value(r.compute)
116
+ await settle()
117
+ expect(r.count).toBe(2)
118
+ r.resolve(1, 2)
119
+ expect(await third).toBe(2)
120
+ })
121
+
122
+ it("leaves the earlier run's callers waiting on a later run's failure", async () => {
123
+ const { memo, clock } = memoAt()
124
+ const r = runs()
125
+ const early = memo.value(r.compute)
126
+ await settle()
127
+ clock.now = 10_000
128
+ const late = memo.value(r.compute)
129
+ await settle()
130
+ r.reject(1, new Error('later run failed'))
131
+ await expect(late).rejects.toThrow('later run failed')
132
+ r.resolve(0, 1)
133
+ expect(await early).toBe(1)
134
+ })
135
+
136
+ it("releases an earlier generation's silent run with the new generation's value", async () => {
137
+ const { memo } = memoAt()
138
+ const r = runs()
139
+ const early = memo.value(r.compute)
140
+ await settle()
141
+ memo.invalidate()
142
+ const late = memo.value(r.compute)
143
+ await settle()
144
+ r.resolve(1, 2)
145
+ expect(await late).toBe(2)
146
+ expect(await early).toBe(2)
147
+ })
148
+ })