react-native-audio-browser 0.2.0-next.2 → 0.2.0-next.21

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 (660) hide show
  1. package/README.md +35 -21
  2. package/android/build.gradle +35 -12
  3. package/android/gradle.properties +2 -2
  4. package/android/src/main/AndroidManifest.xml +3 -1
  5. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +389 -164
  6. package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +38 -0
  7. package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +18 -2
  8. package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +48 -0
  9. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +315 -213
  10. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +24 -5
  11. package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +267 -0
  12. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +97 -58
  13. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +70 -29
  14. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
  15. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -7
  16. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
  17. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
  18. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +20 -3
  19. package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +24 -0
  20. package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +10 -6
  21. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +12 -12
  22. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +111 -58
  23. package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +77 -0
  24. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +28 -10
  25. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +509 -230
  26. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +218 -252
  27. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +21 -25
  28. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +113 -78
  29. package/android/src/main/java/com/audiobrowser/player/Player.kt +81 -38
  30. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
  31. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +1 -1
  32. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +2 -1
  33. package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
  34. package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +67 -11
  35. package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +168 -0
  36. package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
  37. package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +35 -7
  38. package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +278 -59
  39. package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
  40. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +56 -40
  41. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
  42. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +108 -0
  43. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +56 -52
  44. package/android/src/main/res/values/strings.xml +25 -5
  45. package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +87 -0
  46. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +119 -33
  47. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
  48. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -0
  49. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +346 -8
  50. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +38 -0
  51. package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +277 -0
  52. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -2
  53. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +147 -0
  54. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -55
  55. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +154 -0
  56. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
  57. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
  58. package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
  59. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +385 -0
  60. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +101 -58
  61. package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
  62. package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +45 -0
  63. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
  64. package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +3 -4
  65. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
  66. package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +3 -3
  67. package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
  68. package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +197 -7
  69. package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +325 -4
  70. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
  71. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +83 -0
  72. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +41 -16
  73. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +162 -0
  74. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
  75. package/ios/Browser/BrowserConfig.swift +102 -5
  76. package/ios/Browser/BrowserManager+URLResolution.swift +18 -14
  77. package/ios/Browser/BrowserManager.swift +230 -205
  78. package/ios/Browser/BrowserPathHelper.swift +44 -44
  79. package/ios/Browser/InertStyleDiagnostic.swift +279 -0
  80. package/ios/Browser/JsonModels.swift +264 -106
  81. package/ios/Browser/SearchDrillIn.swift +7 -7
  82. package/ios/Browser/SectionPresentation.swift +64 -0
  83. package/ios/Browser/SectionScope.swift +58 -24
  84. package/ios/Browser/StyleResolver.swift +58 -0
  85. package/ios/Browser/TabBarEntries.swift +9 -3
  86. package/ios/Browser/TrackIdTemplate.swift +37 -0
  87. package/ios/CarPlay/CarPlayArtworkResolver.swift +8 -7
  88. package/ios/CarPlay/CarPlayController.swift +227 -85
  89. package/ios/CarPlay/CarPlayImageLoader.swift +42 -20
  90. package/ios/CarPlay/CarPlayListItemFactory.swift +289 -84
  91. package/ios/CarPlay/CarPlayNowPlayingManager.swift +15 -12
  92. package/ios/CarPlay/RNABMediaAddHandler.swift +6 -6
  93. package/ios/CarPlay/RNABMediaAffinityHandler.swift +2 -2
  94. package/ios/CarPlay/RNABMediaIntentHandler.swift +16 -16
  95. package/ios/Extension/Capability+RemoteCommand.swift +1 -1
  96. package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
  97. package/ios/Extension/ResolvedTrack+Copying.swift +13 -15
  98. package/ios/Extension/Section+Copying.swift +29 -0
  99. package/ios/Extension/String+IcyCharset.swift +21 -0
  100. package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -4
  101. package/ios/Extension/Track+Copying.swift +8 -12
  102. package/ios/Extension/Track+Identity.swift +18 -0
  103. package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
  104. package/ios/Http/HttpClient.swift +8 -2
  105. package/ios/HybridAudioBrowser.swift +253 -100
  106. package/ios/Model/NitroTypeStubs.swift +125 -23
  107. package/ios/Model/PlayerUpdateOptions.swift +7 -0
  108. package/ios/Model/RemoteCommand.swift +18 -0
  109. package/ios/Model/TrackPlayerError.swift +2 -2
  110. package/ios/Option/SessionCategories.swift +3 -2
  111. package/ios/Player/MediaIntentCriteria.swift +17 -9
  112. package/ios/Player/MediaLoader.swift +33 -9
  113. package/ios/Player/NowPlayingUpdater.swift +54 -6
  114. package/ios/Player/PlaybackCoordinator.swift +13 -6
  115. package/ios/Player/PlaybackErrorHandler.swift +4 -4
  116. package/ios/Player/PlaybackTimer.swift +8 -2
  117. package/ios/Player/QueueManager.swift +46 -13
  118. package/ios/Player/RetryManager.swift +80 -18
  119. package/ios/Player/SeekCompletionHandler.swift +3 -1
  120. package/ios/Player/ShuffleOrder.swift +33 -0
  121. package/ios/Player/SleepTimerHandling.swift +13 -0
  122. package/ios/RemoteCommand/RemoteCommandCallbacks.swift +47 -0
  123. package/ios/RemoteCommand/RemoteCommandController.swift +62 -24
  124. package/ios/Tests/BrowserPathHelperTests.swift +50 -20
  125. package/ios/Tests/CarPlayArtworkResolverTests.swift +24 -41
  126. package/ios/Tests/InertStyleDiagnosticTests.swift +200 -0
  127. package/ios/Tests/JsonModelsTests.swift +150 -1
  128. package/ios/Tests/LRUCacheTests.swift +111 -0
  129. package/ios/Tests/LoadSeekCoordinatorTests.swift +3 -1
  130. package/ios/Tests/MediaIntentCriteriaTests.swift +2 -2
  131. package/ios/Tests/PlaybackCoordinatorTests.swift +1 -1
  132. package/ios/Tests/PlaybackErrorHandlerTests.swift +3 -1
  133. package/ios/Tests/PlaybackStateStoreTests.swift +4 -3
  134. package/ios/Tests/PlayerTimeObserverTests.swift +37 -0
  135. package/ios/Tests/QueueManagerTests.swift +122 -10
  136. package/ios/Tests/RemoteCommandControllerTests.swift +172 -0
  137. package/ios/Tests/RemoteCommandTests.swift +67 -0
  138. package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -35
  139. package/ios/Tests/RetryManagerTests.swift +89 -0
  140. package/ios/Tests/SearchDrillInTests.swift +16 -16
  141. package/ios/Tests/SectionPresentationTests.swift +90 -0
  142. package/ios/Tests/SectionScopeTests.swift +87 -55
  143. package/ios/Tests/StyleResolverTests.swift +127 -0
  144. package/ios/Tests/Support/TestTypes.swift +8 -1
  145. package/ios/Tests/TabBarEntriesTests.swift +19 -19
  146. package/ios/Tests/TimedMetadataAVFoundationTests.swift +42 -0
  147. package/ios/Tests/TrackIdTemplateTests.swift +67 -0
  148. package/ios/Tests/TrackIdentityTests.swift +20 -0
  149. package/ios/Tests/TrackSelectorTests.swift +168 -33
  150. package/ios/TrackPlayer.swift +63 -35
  151. package/ios/TrackPlayerCallbacks.swift +5 -38
  152. package/ios/TrackSelector.swift +45 -30
  153. package/ios/Util/ArtworkImageFetcher.swift +16 -1
  154. package/ios/Util/LRUCache.swift +4 -1
  155. package/ios/Util/NetworkMonitor.swift +43 -26
  156. package/ios/Util/SFSymbolRenderer.swift +24 -2
  157. package/ios/Util/SVGProcessor.swift +9 -2
  158. package/lib/commonjs/AudioBrowser.js +8 -8
  159. package/lib/commonjs/AudioBrowser.js.map +1 -1
  160. package/lib/commonjs/CLAUDE.md +52 -0
  161. package/lib/commonjs/features/browser-config.js +12 -8
  162. package/lib/commonjs/features/browser-config.js.map +1 -1
  163. package/lib/commonjs/features/browser.js +11 -3
  164. package/lib/commonjs/features/browser.js.map +1 -1
  165. package/lib/commonjs/features/carConnection.js +1 -1
  166. package/lib/commonjs/features/equalizer.js +1 -1
  167. package/lib/commonjs/features/errors.js +3 -3
  168. package/lib/commonjs/features/favorites.js +14 -11
  169. package/lib/commonjs/features/favorites.js.map +1 -1
  170. package/lib/commonjs/features/gate.js +16 -1
  171. package/lib/commonjs/features/gate.js.map +1 -1
  172. package/lib/commonjs/features/metadata.js +20 -3
  173. package/lib/commonjs/features/metadata.js.map +1 -1
  174. package/lib/commonjs/features/network.js +1 -1
  175. package/lib/commonjs/features/nowPlaying.js +1 -1
  176. package/lib/commonjs/features/output.js +1 -1
  177. package/lib/commonjs/features/playback/controls.js +4 -2
  178. package/lib/commonjs/features/playback/controls.js.map +1 -1
  179. package/lib/commonjs/features/playback/playWhenReady.js +1 -1
  180. package/lib/commonjs/features/playback/playing.js +1 -1
  181. package/lib/commonjs/features/playback/progress.js +3 -2
  182. package/lib/commonjs/features/playback/progress.js.map +1 -1
  183. package/lib/commonjs/features/playback/rate.js +8 -1
  184. package/lib/commonjs/features/playback/rate.js.map +1 -1
  185. package/lib/commonjs/features/playback/state.js +3 -4
  186. package/lib/commonjs/features/playback/state.js.map +1 -1
  187. package/lib/commonjs/features/playback/trackPlaybackTime.js +0 -6
  188. package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
  189. package/lib/commonjs/features/playback/volume.js +1 -1
  190. package/lib/commonjs/features/player/options.js +48 -34
  191. package/lib/commonjs/features/player/options.js.map +1 -1
  192. package/lib/commonjs/features/player/setup.js +18 -9
  193. package/lib/commonjs/features/player/setup.js.map +1 -1
  194. package/lib/commonjs/features/player/validateOptions.js +23 -0
  195. package/lib/commonjs/features/player/validateOptions.js.map +1 -0
  196. package/lib/commonjs/features/queue/activeTrack.js +15 -4
  197. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  198. package/lib/commonjs/features/queue/queue.js +13 -6
  199. package/lib/commonjs/features/queue/queue.js.map +1 -1
  200. package/lib/commonjs/features/queue/repeatMode.js +1 -1
  201. package/lib/commonjs/features/queue/shuffle.js +1 -1
  202. package/lib/commonjs/features/remoteControls.js +13 -92
  203. package/lib/commonjs/features/remoteControls.js.map +1 -1
  204. package/lib/commonjs/features/sleepTimer.js +13 -1
  205. package/lib/commonjs/features/sleepTimer.js.map +1 -1
  206. package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
  207. package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
  208. package/lib/commonjs/utils/LazyNativeEmitter.js +28 -14
  209. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  210. package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
  211. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  212. package/lib/commonjs/utils/getTrackIdentity.js +24 -0
  213. package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
  214. package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
  215. package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
  216. package/lib/commonjs/web/NativeAudioBrowser.js +200 -75
  217. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  218. package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
  219. package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
  220. package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
  221. package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
  222. package/lib/commonjs/web/TrackPlayer/Player.js +254 -39
  223. package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
  224. package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
  225. package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
  226. package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +33 -12
  227. package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
  228. package/lib/commonjs/web/browser/BrowserManager.js +175 -100
  229. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  230. package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
  231. package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
  232. package/lib/commonjs/web/browser/SearchManager.js +18 -23
  233. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  234. package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
  235. package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
  236. package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
  237. package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
  238. package/lib/commonjs/web/browser/sections.js +89 -0
  239. package/lib/commonjs/web/browser/sections.js.map +1 -0
  240. package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
  241. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  242. package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
  243. package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
  244. package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
  245. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  246. package/lib/commonjs/web/util/BrowserPathHelper.js +56 -11
  247. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  248. package/lib/module/AudioBrowser.js +2 -1
  249. package/lib/module/AudioBrowser.js.map +1 -1
  250. package/lib/module/CLAUDE.md +52 -0
  251. package/lib/module/features/browser-config.js +12 -8
  252. package/lib/module/features/browser-config.js.map +1 -1
  253. package/lib/module/features/browser.js +11 -3
  254. package/lib/module/features/browser.js.map +1 -1
  255. package/lib/module/features/carConnection.js +1 -1
  256. package/lib/module/features/equalizer.js +1 -1
  257. package/lib/module/features/errors.js +3 -3
  258. package/lib/module/features/favorites.js +14 -11
  259. package/lib/module/features/favorites.js.map +1 -1
  260. package/lib/module/features/gate.js +16 -1
  261. package/lib/module/features/gate.js.map +1 -1
  262. package/lib/module/features/metadata.js +20 -3
  263. package/lib/module/features/metadata.js.map +1 -1
  264. package/lib/module/features/network.js +1 -1
  265. package/lib/module/features/nowPlaying.js +1 -1
  266. package/lib/module/features/output.js +1 -1
  267. package/lib/module/features/playback/controls.js +4 -2
  268. package/lib/module/features/playback/controls.js.map +1 -1
  269. package/lib/module/features/playback/playWhenReady.js +1 -1
  270. package/lib/module/features/playback/playing.js +1 -1
  271. package/lib/module/features/playback/progress.js +3 -2
  272. package/lib/module/features/playback/progress.js.map +1 -1
  273. package/lib/module/features/playback/rate.js +8 -1
  274. package/lib/module/features/playback/rate.js.map +1 -1
  275. package/lib/module/features/playback/state.js +3 -4
  276. package/lib/module/features/playback/state.js.map +1 -1
  277. package/lib/module/features/playback/trackPlaybackTime.js +0 -5
  278. package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
  279. package/lib/module/features/playback/volume.js +1 -1
  280. package/lib/module/features/player/options.js +47 -32
  281. package/lib/module/features/player/options.js.map +1 -1
  282. package/lib/module/features/player/setup.js +17 -8
  283. package/lib/module/features/player/setup.js.map +1 -1
  284. package/lib/module/features/player/validateOptions.js +19 -0
  285. package/lib/module/features/player/validateOptions.js.map +1 -0
  286. package/lib/module/features/queue/activeTrack.js +15 -4
  287. package/lib/module/features/queue/activeTrack.js.map +1 -1
  288. package/lib/module/features/queue/queue.js +13 -6
  289. package/lib/module/features/queue/queue.js.map +1 -1
  290. package/lib/module/features/queue/repeatMode.js +1 -1
  291. package/lib/module/features/queue/shuffle.js +1 -1
  292. package/lib/module/features/remoteControls.js +13 -92
  293. package/lib/module/features/remoteControls.js.map +1 -1
  294. package/lib/module/features/sleepTimer.js +13 -1
  295. package/lib/module/features/sleepTimer.js.map +1 -1
  296. package/lib/module/test-utils/reactNativeStub.js +58 -0
  297. package/lib/module/test-utils/reactNativeStub.js.map +1 -0
  298. package/lib/module/utils/LazyNativeEmitter.js +28 -14
  299. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  300. package/lib/module/utils/NativeUpdatedValue.js +31 -13
  301. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  302. package/lib/module/utils/getTrackIdentity.js +20 -0
  303. package/lib/module/utils/getTrackIdentity.js.map +1 -0
  304. package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
  305. package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
  306. package/lib/module/web/NativeAudioBrowser.js +200 -75
  307. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  308. package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
  309. package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
  310. package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
  311. package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
  312. package/lib/module/web/TrackPlayer/Player.js +254 -39
  313. package/lib/module/web/TrackPlayer/Player.js.map +1 -1
  314. package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
  315. package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
  316. package/lib/module/web/TrackPlayer/QueuePlayer.js +33 -12
  317. package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
  318. package/lib/module/web/browser/BrowserManager.js +175 -100
  319. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  320. package/lib/module/web/browser/FavoriteManager.js +31 -21
  321. package/lib/module/web/browser/FavoriteManager.js.map +1 -1
  322. package/lib/module/web/browser/SearchManager.js +18 -23
  323. package/lib/module/web/browser/SearchManager.js.map +1 -1
  324. package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
  325. package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
  326. package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
  327. package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
  328. package/lib/module/web/browser/sections.js +83 -0
  329. package/lib/module/web/browser/sections.js.map +1 -0
  330. package/lib/module/web/http/RequestConfigBuilder.js +110 -27
  331. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  332. package/lib/module/web/http/followMediaRedirect.js +215 -0
  333. package/lib/module/web/http/followMediaRedirect.js.map +1 -0
  334. package/lib/module/web/player/NowPlayingManager.js +4 -3
  335. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  336. package/lib/module/web/util/BrowserPathHelper.js +56 -11
  337. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  338. package/lib/typescript/package.json +1 -0
  339. package/lib/typescript/src/AudioBrowser.d.ts +1 -1
  340. package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
  341. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  342. package/lib/typescript/src/features/browser.d.ts +10 -2
  343. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  344. package/lib/typescript/src/features/carConnection.d.ts +1 -1
  345. package/lib/typescript/src/features/equalizer.d.ts +1 -1
  346. package/lib/typescript/src/features/errors.d.ts +3 -3
  347. package/lib/typescript/src/features/favorites.d.ts +14 -11
  348. package/lib/typescript/src/features/favorites.d.ts.map +1 -1
  349. package/lib/typescript/src/features/gate.d.ts +18 -2
  350. package/lib/typescript/src/features/gate.d.ts.map +1 -1
  351. package/lib/typescript/src/features/metadata.d.ts +20 -3
  352. package/lib/typescript/src/features/metadata.d.ts.map +1 -1
  353. package/lib/typescript/src/features/network.d.ts +1 -1
  354. package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
  355. package/lib/typescript/src/features/output.d.ts +1 -1
  356. package/lib/typescript/src/features/playback/controls.d.ts +4 -2
  357. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  358. package/lib/typescript/src/features/playback/playWhenReady.d.ts +1 -1
  359. package/lib/typescript/src/features/playback/playing.d.ts +1 -1
  360. package/lib/typescript/src/features/playback/progress.d.ts +1 -1
  361. package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
  362. package/lib/typescript/src/features/playback/rate.d.ts +8 -1
  363. package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
  364. package/lib/typescript/src/features/playback/state.d.ts +3 -4
  365. package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
  366. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
  367. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  368. package/lib/typescript/src/features/playback/volume.d.ts +1 -1
  369. package/lib/typescript/src/features/player/options.d.ts +108 -56
  370. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  371. package/lib/typescript/src/features/player/setup.d.ts +14 -4
  372. package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
  373. package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
  374. package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
  375. package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -2
  376. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  377. package/lib/typescript/src/features/queue/queue.d.ts +7 -4
  378. package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
  379. package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
  380. package/lib/typescript/src/features/queue/shuffle.d.ts +1 -1
  381. package/lib/typescript/src/features/remoteControls.d.ts +23 -22
  382. package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
  383. package/lib/typescript/src/features/sleepTimer.d.ts +1 -1
  384. package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
  385. package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
  386. package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
  387. package/lib/typescript/src/types/browser-native.d.ts +3 -2
  388. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  389. package/lib/typescript/src/types/browser-nodes.d.ts +380 -126
  390. package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
  391. package/lib/typescript/src/types/browser.d.ts +82 -57
  392. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  393. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +19 -16
  394. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  395. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
  396. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  397. package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
  398. package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
  399. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
  400. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
  401. package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +1 -2
  402. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
  403. package/nitrogen/generated/android/c++/JAndroidOptions.hpp +10 -10
  404. package/nitrogen/generated/android/c++/{JFavoritesMatchMode.hpp → JArtworkRendering.hpp} +15 -15
  405. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +8 -3
  406. package/nitrogen/generated/android/c++/JBrowseResult.hpp +16 -4
  407. package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
  408. package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
  409. package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +8 -3
  410. package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +8 -3
  411. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +8 -3
  412. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +8 -3
  413. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +8 -3
  414. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +8 -3
  415. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +8 -2
  416. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +8 -2
  417. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
  418. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +16 -4
  419. package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +8 -3
  420. package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +7 -10
  421. package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +8 -3
  422. package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +15 -3
  423. package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +8 -2
  424. package/nitrogen/generated/android/c++/JGridTile.hpp +61 -0
  425. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +45 -25
  426. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
  427. package/nitrogen/generated/android/c++/JIOSOptions.hpp +9 -3
  428. package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
  429. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +8 -3
  430. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +36 -11
  431. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +14 -2
  432. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +15 -12
  433. package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +7 -10
  434. package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +10 -10
  435. package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +9 -3
  436. package/nitrogen/generated/android/c++/JOptions.hpp +7 -10
  437. package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +8 -3
  438. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -11
  439. package/nitrogen/generated/android/c++/{JNotificationButton.hpp → JRemoteButton.hpp} +19 -19
  440. package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +86 -0
  441. package/nitrogen/generated/android/c++/JResolvedTrack.hpp +57 -49
  442. package/nitrogen/generated/android/c++/JSection.hpp +116 -0
  443. package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
  444. package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
  445. package/nitrogen/generated/android/c++/JTrack.hpp +25 -46
  446. package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +8 -2
  447. package/nitrogen/generated/android/c++/JTrackStyle.hpp +46 -18
  448. package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.cpp +26 -0
  449. package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +75 -0
  450. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +16 -4
  451. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +3 -3
  452. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
  453. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
  454. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
  455. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +80 -0
  456. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +24 -0
  457. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
  458. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +6 -3
  459. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
  460. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +8 -5
  461. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +3 -3
  462. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +6 -3
  463. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +2 -2
  464. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{NotificationButton.kt → RemoteButton.kt} +3 -3
  465. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +44 -0
  466. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +12 -15
  467. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → Section.kt} +15 -6
  468. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +59 -0
  469. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
  470. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +6 -12
  471. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +35 -5
  472. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{Variant_NullType_NotificationButtonLayout.kt → Variant_NullType_RemoteButtonLayout.kt} +9 -9
  473. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +9 -0
  474. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +244 -133
  475. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +31 -16
  476. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +33 -18
  477. package/nitrogen/generated/ios/swift/AndroidOptions.swift +12 -12
  478. package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
  479. package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
  480. package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
  481. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
  482. package/nitrogen/generated/ios/swift/GridTile.swift +44 -0
  483. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
  484. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
  485. package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
  486. package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
  487. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
  488. package/nitrogen/generated/ios/swift/NitroAndroidUpdateOptions.swift +12 -12
  489. package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
  490. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
  491. package/nitrogen/generated/ios/swift/{NotificationButton.swift → RemoteButton.swift} +6 -6
  492. package/nitrogen/generated/ios/swift/RemoteButtonLayout.swift +57 -0
  493. package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
  494. package/nitrogen/generated/ios/swift/Section.swift +82 -0
  495. package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
  496. package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
  497. package/nitrogen/generated/ios/swift/Track.swift +28 -63
  498. package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
  499. package/nitrogen/generated/ios/swift/{Variant_NullType_NotificationButtonLayout.swift → Variant_NullType_RemoteButtonLayout.swift} +3 -3
  500. package/nitrogen/generated/shared/c++/AndroidOptions.hpp +8 -8
  501. package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
  502. package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
  503. package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
  504. package/nitrogen/generated/shared/c++/GridTile.hpp +80 -0
  505. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +1 -1
  506. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -1
  507. package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
  508. package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
  509. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
  510. package/nitrogen/generated/shared/c++/NitroAndroidUpdateOptions.hpp +8 -8
  511. package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
  512. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
  513. package/nitrogen/generated/shared/c++/{NotificationButton.hpp → RemoteButton.hpp} +19 -19
  514. package/nitrogen/generated/shared/c++/RemoteButtonLayout.hpp +94 -0
  515. package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
  516. package/nitrogen/generated/shared/c++/Section.hpp +102 -0
  517. package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
  518. package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
  519. package/nitrogen/generated/shared/c++/Track.hpp +18 -30
  520. package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
  521. package/package.json +24 -11
  522. package/src/AudioBrowser.ts +2 -1
  523. package/src/CLAUDE.md +52 -0
  524. package/src/features/battery.test.ts +79 -0
  525. package/src/features/browser-config.test.ts +21 -6
  526. package/src/features/browser-config.ts +12 -8
  527. package/src/features/browser.test.ts +1 -1
  528. package/src/features/browser.ts +11 -3
  529. package/src/features/carConnection.ts +1 -1
  530. package/src/features/equalizer.ts +1 -1
  531. package/src/features/errors.ts +3 -3
  532. package/src/features/favorites.ts +14 -11
  533. package/src/features/gate.ts +16 -1
  534. package/src/features/hook-wiring.test.ts +302 -0
  535. package/src/features/metadata.ts +20 -3
  536. package/src/features/network.ts +1 -1
  537. package/src/features/nowPlaying.ts +1 -1
  538. package/src/features/output.ts +1 -1
  539. package/src/features/playback/controls.ts +4 -2
  540. package/src/features/playback/playWhenReady.ts +1 -1
  541. package/src/features/playback/playing.ts +1 -1
  542. package/src/features/playback/progress.test.ts +169 -0
  543. package/src/features/playback/progress.ts +3 -2
  544. package/src/features/playback/rate.ts +8 -1
  545. package/src/features/playback/state.ts +3 -4
  546. package/src/features/playback/trackPlaybackTime.test.ts +16 -6
  547. package/src/features/playback/trackPlaybackTime.ts +1 -6
  548. package/src/features/playback/volume.ts +1 -1
  549. package/src/features/player/options.ts +126 -76
  550. package/src/features/player/setup.test.ts +24 -7
  551. package/src/features/player/setup.ts +22 -10
  552. package/src/features/player/validateOptions.ts +21 -0
  553. package/src/features/queue/activeTrack.ts +15 -4
  554. package/src/features/queue/queue.ts +13 -6
  555. package/src/features/queue/repeatMode.ts +1 -1
  556. package/src/features/queue/shuffle.ts +1 -1
  557. package/src/features/remoteControls.ts +13 -92
  558. package/src/features/sleepTimer.test.ts +172 -0
  559. package/src/features/sleepTimer.ts +9 -1
  560. package/src/nitro-stub-drift.test.ts +277 -0
  561. package/src/public-surface.test.ts +147 -0
  562. package/src/specs/audio-browser.nitro.ts +5 -4
  563. package/src/style-resolution.test.ts +210 -0
  564. package/src/test-utils/reactNativeStub.ts +60 -0
  565. package/src/types/browser-native.ts +7 -3
  566. package/src/types/browser-nodes.ts +396 -134
  567. package/src/types/browser.ts +85 -59
  568. package/src/utils/LazyNativeEmitter.ts +28 -15
  569. package/src/utils/NativeUpdatedValue.ts +29 -13
  570. package/src/utils/getTrackIdentity.ts +20 -0
  571. package/src/utils/useDebug.test.ts +182 -0
  572. package/src/utils/useNativeUpdatedValue.test.ts +103 -0
  573. package/src/utils/useNativeValueRefreshedBy.ts +38 -0
  574. package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
  575. package/src/web/NativeAudioBrowser.ts +239 -82
  576. package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
  577. package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
  578. package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
  579. package/src/web/TrackPlayer/Player.dispatch.test.ts +5 -3
  580. package/src/web/TrackPlayer/Player.load.test.ts +137 -1
  581. package/src/web/TrackPlayer/Player.ts +284 -37
  582. package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
  583. package/src/web/TrackPlayer/QueueManager.ts +14 -0
  584. package/src/web/TrackPlayer/QueuePlayer.ts +33 -14
  585. package/src/web/__tests__/lifecycle.test.ts +345 -0
  586. package/src/web/__tests__/lifecycleHarness.ts +351 -0
  587. package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
  588. package/src/web/__tests__/loadSupersession.test.ts +175 -0
  589. package/src/web/__tests__/retry.test.ts +169 -0
  590. package/src/web/browser/BrowserManager.ts +209 -111
  591. package/src/web/browser/FavoriteManager.test.ts +84 -0
  592. package/src/web/browser/FavoriteManager.ts +28 -23
  593. package/src/web/browser/SearchManager.test.ts +75 -0
  594. package/src/web/browser/SearchManager.ts +25 -28
  595. package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
  596. package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
  597. package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
  598. package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
  599. package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
  600. package/src/web/browser/assertBrowsePageShape.ts +5 -3
  601. package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
  602. package/src/web/browser/classifyTrackNavigation.ts +9 -9
  603. package/src/web/browser/parseSearchResponse.test.ts +8 -2
  604. package/src/web/browser/sections.test.ts +91 -0
  605. package/src/web/browser/sections.ts +72 -0
  606. package/src/web/http/RequestConfigBuilder.test.ts +241 -1
  607. package/src/web/http/RequestConfigBuilder.ts +140 -33
  608. package/src/web/http/followMediaRedirect.test.ts +289 -0
  609. package/src/web/http/followMediaRedirect.ts +253 -0
  610. package/src/web/player/NowPlayingManager.ts +4 -3
  611. package/src/web/util/BrowserPathHelper.test.ts +52 -0
  612. package/src/web/util/BrowserPathHelper.ts +61 -13
  613. package/website/guide/android-auto.md +114 -0
  614. package/website/guide/android-certificates.md +409 -0
  615. package/website/guide/artwork.md +255 -0
  616. package/website/guide/audio-output.md +135 -0
  617. package/website/guide/automotive.md +86 -0
  618. package/website/guide/basic-usage.md +151 -0
  619. package/website/guide/battery.md +115 -0
  620. package/website/guide/browser.md +581 -0
  621. package/website/guide/carplay.md +620 -0
  622. package/website/guide/configuration.md +173 -0
  623. package/website/guide/equalizer.md +231 -0
  624. package/website/guide/errors.md +310 -0
  625. package/website/guide/favorites.md +154 -0
  626. package/website/guide/gate.md +143 -0
  627. package/website/guide/getting-started.md +46 -0
  628. package/website/guide/hooks.md +238 -0
  629. package/website/guide/live-streams.md +125 -0
  630. package/website/guide/metadata.md +239 -0
  631. package/website/guide/migrating-from-track-player.md +244 -0
  632. package/website/guide/native-callback-fetch.md +127 -0
  633. package/website/guide/network.md +86 -0
  634. package/website/guide/now-playing.md +175 -0
  635. package/website/guide/playback.md +328 -0
  636. package/website/guide/queue.md +300 -0
  637. package/website/guide/remote-controls.md +256 -0
  638. package/website/guide/search.md +255 -0
  639. package/website/guide/sleep-timer.md +268 -0
  640. package/website/guide/track.md +247 -0
  641. package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
  642. package/ios/Model/MediaURL.swift +0 -67
  643. package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
  644. package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
  645. package/nitrogen/generated/android/c++/JNotificationButtonLayout.hpp +0 -94
  646. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
  647. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
  648. package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.cpp +0 -26
  649. package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.hpp +0 -75
  650. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
  651. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NotificationButtonLayout.kt +0 -50
  652. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
  653. package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
  654. package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
  655. package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
  656. package/nitrogen/generated/ios/swift/NotificationButtonLayout.swift +0 -92
  657. package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
  658. package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
  659. package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
  660. package/nitrogen/generated/shared/c++/NotificationButtonLayout.hpp +0 -102
@@ -4,15 +4,17 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.FavoriteManager = void 0;
7
+ var _getTrackIdentity = require("../../utils/getTrackIdentity");
7
8
  /**
8
- * Manages favorite state for tracks.
9
+ * Manages favorite state for tracks, keyed by track identity (`id` when set,
10
+ * falling back to `src` — see getTrackIdentity / ADR 0008).
9
11
  * Matches Android's favorite hydration behavior.
10
12
  */
11
13
  class FavoriteManager {
12
14
  favorites = new Set();
13
15
 
14
16
  /**
15
- * Sets the favorites cache from an array of track src values.
17
+ * Sets the favorites cache from an array of track identities.
16
18
  * This is typically called when favorites are loaded from storage.
17
19
  */
18
20
  setFavorites(favorites) {
@@ -20,24 +22,27 @@ class FavoriteManager {
20
22
  }
21
23
 
22
24
  /**
23
- * Checks if a track is favorited based on its src.
25
+ * Checks if a track is favorited based on its identity.
24
26
  */
25
- isFavorited(src) {
26
- return this.favorites.has(src);
27
+ isFavorited(track) {
28
+ const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
29
+ return identity !== undefined && this.favorites.has(identity);
27
30
  }
28
31
 
29
32
  /**
30
- * Adds a track src to the favorites cache.
33
+ * Adds a track to the favorites cache under its identity.
31
34
  */
32
- addFavorite(src) {
33
- this.favorites.add(src);
35
+ addFavorite(track) {
36
+ const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
37
+ if (identity !== undefined) this.favorites.add(identity);
34
38
  }
35
39
 
36
40
  /**
37
- * Removes a track src from the favorites cache.
41
+ * Removes a track from the favorites cache under its identity.
38
42
  */
39
- removeFavorite(src) {
40
- this.favorites.delete(src);
43
+ removeFavorite(track) {
44
+ const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
45
+ if (identity !== undefined) this.favorites.delete(identity);
41
46
  }
42
47
 
43
48
  /**
@@ -51,8 +56,7 @@ class FavoriteManager {
51
56
  // Don't overwrite API-provided favorites
52
57
  if (track.favorited !== undefined && track.favorited !== null) return track;
53
58
  if (this.favorites.size === 0) return track;
54
- const isFavorited = track.src ? this.favorites.has(track.src) : false;
55
- if (!isFavorited) return track;
59
+ if (!this.isFavorited(track)) return track;
56
60
  return {
57
61
  ...track,
58
62
  favorited: true
@@ -60,19 +64,24 @@ class FavoriteManager {
60
64
  }
61
65
 
62
66
  /**
63
- * Hydrates favorites on all children of a ResolvedTrack.
64
- * Matches Android's hydrateChildren behavior.
67
+ * Hydrates favorites on all tracks of a resolved page.
68
+ * Matches Android's hydrateChildren behavior. Pages reach hydration
69
+ * normalized (ADR 0010), so `sections` is the only structure to walk.
65
70
  *
66
- * @param resolvedTrack ResolvedTrack with children to hydrate
67
- * @returns ResolvedTrack with favorited properties set on children
71
+ * @param resolvedTrack Resolved page to hydrate
72
+ * @returns Resolved page with favorited properties set on its tracks
68
73
  */
69
74
  hydrateChildren(resolvedTrack) {
70
- const children = resolvedTrack.children;
71
- if (!children) return resolvedTrack;
72
- const hydratedChildren = children.map(track => this.hydrateFavorite(track));
75
+ const {
76
+ sections
77
+ } = resolvedTrack;
78
+ if (!sections) return resolvedTrack;
73
79
  return {
74
80
  ...resolvedTrack,
75
- children: hydratedChildren
81
+ sections: sections.map(section => ({
82
+ ...section,
83
+ children: section.children.map(track => this.hydrateFavorite(track))
84
+ }))
76
85
  };
77
86
  }
78
87
  }
@@ -1 +1 @@
1
- {"version":3,"names":["FavoriteManager","favorites","Set","setFavorites","isFavorited","src","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","track","favorited","undefined","size","hydrateChildren","resolvedTrack","children","hydratedChildren","map","exports"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACO,MAAMA,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,GAAW,EAAW;IAChC,OAAO,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACD,GAAG,CAAC;EAChC;;EAEA;AACF;AACA;EACEE,WAAWA,CAACF,GAAW,EAAQ;IAC7B,IAAI,CAACJ,SAAS,CAACO,GAAG,CAACH,GAAG,CAAC;EACzB;;EAEA;AACF;AACA;EACEI,cAAcA,CAACJ,GAAW,EAAQ;IAChC,IAAI,CAACJ,SAAS,CAACS,MAAM,CAACL,GAAG,CAAC;EAC5B;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEM,eAAeA,CAACC,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACC,SAAS,KAAKC,SAAS,IAAIF,KAAK,CAACC,SAAS,KAAK,IAAI,EAAE,OAAOD,KAAK;IAC3E,IAAI,IAAI,CAACX,SAAS,CAACc,IAAI,KAAK,CAAC,EAAE,OAAOH,KAAK;IAE3C,MAAMR,WAAW,GAAGQ,KAAK,CAACP,GAAG,GAAG,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACM,KAAK,CAACP,GAAG,CAAC,GAAG,KAAK;IACrE,IAAI,CAACD,WAAW,EAAE,OAAOQ,KAAK;IAE9B,OAAO;MACL,GAAGA,KAAK;MACRC,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEG,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAMC,QAAQ,GAAGD,aAAa,CAACC,QAAQ;IACvC,IAAI,CAACA,QAAQ,EAAE,OAAOD,aAAa;IAEnC,MAAME,gBAAgB,GAAGD,QAAQ,CAACE,GAAG,CAAER,KAAK,IAC1C,IAAI,CAACD,eAAe,CAACC,KAAK,CAC5B,CAAC;IACD,OAAO;MACL,GAAGK,aAAa;MAChBC,QAAQ,EAAEC;IACZ,CAAC;EACH;AACF;AAACE,OAAA,CAAArB,eAAA,GAAAA,eAAA","ignoreList":[]}
1
+ {"version":3,"names":["_getTrackIdentity","require","FavoriteManager","favorites","Set","setFavorites","isFavorited","track","identity","getTrackIdentity","undefined","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","favorited","size","hydrateChildren","resolvedTrack","sections","map","section","children","exports"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,KAAY,EAAW;IACjC,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,OAAOC,QAAQ,KAAKE,SAAS,IAAI,IAAI,CAACP,SAAS,CAACQ,GAAG,CAACH,QAAQ,CAAC;EAC/D;;EAEA;AACF;AACA;EACEI,WAAWA,CAACL,KAAY,EAAQ;IAC9B,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKE,SAAS,EAAE,IAAI,CAACP,SAAS,CAACU,GAAG,CAACL,QAAQ,CAAC;EAC1D;;EAEA;AACF;AACA;EACEM,cAAcA,CAACP,KAAY,EAAQ;IACjC,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKE,SAAS,EAAE,IAAI,CAACP,SAAS,CAACY,MAAM,CAACP,QAAQ,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEQ,eAAeA,CAACT,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACU,SAAS,KAAKP,SAAS,IAAIH,KAAK,CAACU,SAAS,KAAK,IAAI,EAAE,OAAOV,KAAK;IAC3E,IAAI,IAAI,CAACJ,SAAS,CAACe,IAAI,KAAK,CAAC,EAAE,OAAOX,KAAK;IAE3C,IAAI,CAAC,IAAI,CAACD,WAAW,CAACC,KAAK,CAAC,EAAE,OAAOA,KAAK;IAE1C,OAAO;MACL,GAAGA,KAAK;MACRU,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAM;MAAEC;IAAS,CAAC,GAAGD,aAAa;IAClC,IAAI,CAACC,QAAQ,EAAE,OAAOD,aAAa;IAEnC,OAAO;MACL,GAAGA,aAAa;MAChBC,QAAQ,EAAEA,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;QACnC,GAAGA,OAAO;QACVC,QAAQ,EAAED,OAAO,CAACC,QAAQ,CAACF,GAAG,CAAEf,KAAK,IAAK,IAAI,CAACS,eAAe,CAACT,KAAK,CAAC;MACvE,CAAC,CAAC;IACJ,CAAC;EACH;AACF;AAACkB,OAAA,CAAAvB,eAAA,GAAAA,eAAA","ignoreList":[]}
@@ -20,7 +20,9 @@ class SearchManager {
20
20
  * Matches Android's BrowserManager.search(params: SearchParams) behavior.
21
21
  *
22
22
  * @param params Search parameters (query is required, other fields optional)
23
- * @returns Array of matching tracks
23
+ * @returns Array of matching tracks — empty only when the source found none
24
+ * @throws The failure itself: an `Error` carrying a `NavigationErrorType`
25
+ * `code` from `HttpClient`, or whatever a `searchCallback` rejected with
24
26
  */
25
27
  async search(params) {
26
28
  // Find __search__ route entry
@@ -50,31 +52,24 @@ class SearchManager {
50
52
 
51
53
  // Delegate to the shared layered fetch (request → search) on BrowserManager
52
54
  // so the ladder lives in one place.
53
- try {
54
- results = await this.browserManager.fetchSearchResults(searchRoute.searchConfig, searchQueryParams);
55
- } catch (error) {
56
- console.error('Search failed:', error);
57
- return [];
58
- }
55
+ results = await this.browserManager.fetchSearchResults(searchRoute.searchConfig, searchQueryParams);
59
56
  }
60
57
 
61
58
  // Transform artwork URLs on search results using async method with full Track access
62
- const {
63
- request: requestConfig,
64
- artwork: artworkConfig
65
- } = this.browserManager.configuration;
66
- if (artworkConfig) {
67
- results = await Promise.all(results.map(async track => {
68
- const artworkSource = await _RequestConfigBuilder.RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
69
- if (artworkSource && !track.artworkSource) {
70
- return {
71
- ...track,
72
- artworkSource
73
- };
74
- }
75
- return track;
76
- }));
77
- }
59
+ // Gated per track inside the resolver, as on Android — a result carrying a
60
+ // plain `artwork` URL resolves even with no `artwork` config.
61
+ const requestConfig = await this.browserManager.resolvedRequestConfig();
62
+ const artworkConfig = this.browserManager.configuration.artwork;
63
+ results = await Promise.all(results.map(async track => {
64
+ const artworkSource = await _RequestConfigBuilder.RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
65
+ if (artworkSource && !track.artworkSource) {
66
+ return {
67
+ ...track,
68
+ artworkSource
69
+ };
70
+ }
71
+ return track;
72
+ }));
78
73
  return results;
79
74
  }
80
75
  }
@@ -1 +1 @@
1
- {"version":3,"names":["_RequestConfigBuilder","require","SearchManager","constructor","browserManager","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","reference","genre","artist","album","title","playlist","fetchSearchResults","error","console","request","requestConfig","artwork","artworkConfig","Promise","all","map","track","artworkSource","RequestConfigBuilder","resolveArtworkSourceAsync","exports"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;;;;;AAEA,IAAAA,qBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CAASC,cAA8B,EAAE;IAAA,KAAhCA,cAA8B,GAA9BA,cAA8B;EAAG;;EAErD;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACH,cAAc,CAACI,aAAa,CAACC,MAAM,EAAEC,IAAI,CAC/DC,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAK,YACpB,CAAC;IACD,IAAI,CAACL,WAAW,EAAE;MAChB,OAAO,EAAE;IACX;IAEA,IAAIM,OAAgB,GAAG,EAAE;;IAEzB;IACA,IAAIN,WAAW,CAACO,cAAc,EAAE;MAC9BD,OAAO,GAAG,MAAMN,WAAW,CAACO,cAAc,CAACR,MAAM,CAAC;IACpD;IACA;IAAA,KACK,IAAIC,WAAW,CAACQ,YAAY,EAAE;MACjC;MACA,MAAMC,iBAAyC,GAAG;QAChDC,CAAC,EAAEX,MAAM,CAACY;MACZ,CAAC;MACD,IAAIZ,MAAM,CAACa,IAAI,EAAEH,iBAAiB,CAACG,IAAI,GAAGb,MAAM,CAACa,IAAI;MACrD,IAAIb,MAAM,CAACc,SAAS,KAAK,IAAI,EAAEJ,iBAAiB,CAACI,SAAS,GAAG,IAAI;MACjE,IAAId,MAAM,CAACe,KAAK,EAAEL,iBAAiB,CAACK,KAAK,GAAGf,MAAM,CAACe,KAAK;MACxD,IAAIf,MAAM,CAACgB,MAAM,EAAEN,iBAAiB,CAACM,MAAM,GAAGhB,MAAM,CAACgB,MAAM;MAC3D,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,KAAK,EAAER,iBAAiB,CAACQ,KAAK,GAAGlB,MAAM,CAACkB,KAAK;MACxD,IAAIlB,MAAM,CAACmB,QAAQ,EAAET,iBAAiB,CAACS,QAAQ,GAAGnB,MAAM,CAACmB,QAAQ;;MAEjE;MACA;MACA,IAAI;QACFZ,OAAO,GAAG,MAAM,IAAI,CAACT,cAAc,CAACsB,kBAAkB,CACpDnB,WAAW,CAACQ,YAAY,EACxBC,iBACF,CAAC;MACH,CAAC,CAAC,OAAOW,KAAK,EAAE;QACdC,OAAO,CAACD,KAAK,CAAC,gBAAgB,EAAEA,KAAK,CAAC;QACtC,OAAO,EAAE;MACX;IACF;;IAEA;IACA,MAAM;MAAEE,OAAO,EAAEC,aAAa;MAAEC,OAAO,EAAEC;IAAc,CAAC,GACtD,IAAI,CAAC5B,cAAc,CAACI,aAAa;IACnC,IAAIwB,aAAa,EAAE;MACjBnB,OAAO,GAAG,MAAMoB,OAAO,CAACC,GAAG,CACzBrB,OAAO,CAACsB,GAAG,CAAC,MAAOC,KAAK,IAAK;QAC3B,MAAMC,aAAa,GACjB,MAAMC,0CAAoB,CAACC,yBAAyB,CAClDH,KAAK,EACLN,aAAa,EACbE,aACF,CAAC;QACH,IAAIK,aAAa,IAAI,CAACD,KAAK,CAACC,aAAa,EAAE;UACzC,OAAO;YAAE,GAAGD,KAAK;YAAEC;UAAc,CAAC;QACpC;QACA,OAAOD,KAAK;MACd,CAAC,CACH,CAAC;IACH;IAEA,OAAOvB,OAAO;EAChB;AACF;AAAC2B,OAAA,CAAAtC,aAAA,GAAAA,aAAA","ignoreList":[]}
1
+ {"version":3,"names":["_RequestConfigBuilder","require","SearchManager","constructor","browserManager","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","reference","genre","artist","album","title","playlist","fetchSearchResults","requestConfig","resolvedRequestConfig","artworkConfig","artwork","Promise","all","map","track","artworkSource","RequestConfigBuilder","resolveArtworkSourceAsync","exports"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;;;;;AAEA,IAAAA,qBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CAASC,cAA8B,EAAE;IAAA,KAAhCA,cAA8B,GAA9BA,cAA8B;EAAG;;EAErD;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACH,cAAc,CAACI,aAAa,CAACC,MAAM,EAAEC,IAAI,CAC/DC,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAK,YACpB,CAAC;IACD,IAAI,CAACL,WAAW,EAAE;MAChB,OAAO,EAAE;IACX;IAEA,IAAIM,OAAgB,GAAG,EAAE;;IAEzB;IACA,IAAIN,WAAW,CAACO,cAAc,EAAE;MAC9BD,OAAO,GAAG,MAAMN,WAAW,CAACO,cAAc,CAACR,MAAM,CAAC;IACpD;IACA;IAAA,KACK,IAAIC,WAAW,CAACQ,YAAY,EAAE;MACjC;MACA,MAAMC,iBAAyC,GAAG;QAChDC,CAAC,EAAEX,MAAM,CAACY;MACZ,CAAC;MACD,IAAIZ,MAAM,CAACa,IAAI,EAAEH,iBAAiB,CAACG,IAAI,GAAGb,MAAM,CAACa,IAAI;MACrD,IAAIb,MAAM,CAACc,SAAS,KAAK,IAAI,EAAEJ,iBAAiB,CAACI,SAAS,GAAG,IAAI;MACjE,IAAId,MAAM,CAACe,KAAK,EAAEL,iBAAiB,CAACK,KAAK,GAAGf,MAAM,CAACe,KAAK;MACxD,IAAIf,MAAM,CAACgB,MAAM,EAAEN,iBAAiB,CAACM,MAAM,GAAGhB,MAAM,CAACgB,MAAM;MAC3D,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,KAAK,EAAER,iBAAiB,CAACQ,KAAK,GAAGlB,MAAM,CAACkB,KAAK;MACxD,IAAIlB,MAAM,CAACmB,QAAQ,EAAET,iBAAiB,CAACS,QAAQ,GAAGnB,MAAM,CAACmB,QAAQ;;MAEjE;MACA;MACAZ,OAAO,GAAG,MAAM,IAAI,CAACT,cAAc,CAACsB,kBAAkB,CACpDnB,WAAW,CAACQ,YAAY,EACxBC,iBACF,CAAC;IACH;;IAEA;IACA;IACA;IACA,MAAMW,aAAa,GAAG,MAAM,IAAI,CAACvB,cAAc,CAACwB,qBAAqB,CAAC,CAAC;IACvE,MAAMC,aAAa,GAAG,IAAI,CAACzB,cAAc,CAACI,aAAa,CAACsB,OAAO;IAC/DjB,OAAO,GAAG,MAAMkB,OAAO,CAACC,GAAG,CACzBnB,OAAO,CAACoB,GAAG,CAAC,MAAOC,KAAK,IAAK;MAC3B,MAAMC,aAAa,GACjB,MAAMC,0CAAoB,CAACC,yBAAyB,CAClDH,KAAK,EACLP,aAAa,EACbE,aACF,CAAC;MACH,IAAIM,aAAa,IAAI,CAACD,KAAK,CAACC,aAAa,EAAE;QACzC,OAAO;UAAE,GAAGD,KAAK;UAAEC;QAAc,CAAC;MACpC;MACA,OAAOD,KAAK;IACd,CAAC,CACH,CAAC;IAED,OAAOrB,OAAO;EAChB;AACF;AAACyB,OAAA,CAAApC,aAAA,GAAAA,aAAA","ignoreList":[]}
@@ -12,10 +12,10 @@ exports.assertBrowsePageShape = assertBrowsePageShape;
12
12
  */
13
13
  function assertBrowsePageShape(response, path) {
14
14
  if (Array.isArray(response)) {
15
- throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, children?: Track[] }. Wrap the rows in a ` + `\`children\` array.`);
15
+ throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, sections?: Section[], children?: Track[] }. ` + `Wrap the rows in a \`children\` array (one untitled section) or ` + `group them into \`sections\`.`);
16
16
  }
17
17
  if (response === null || typeof response !== 'object') {
18
- throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, children?: Track[] }.`);
18
+ throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, sections?: Section[], ` + `children?: Track[] }.`);
19
19
  }
20
20
  return response;
21
21
  }
@@ -1 +1 @@
1
- {"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,gEAAgE,GAChE,qBACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,uDACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}
1
+ {"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,mEAAmE,GACnE,kEAAkE,GAClE,+BACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,wDAAwD,GACxD,uBACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}
@@ -8,10 +8,10 @@ var _BrowserPathHelper = require("../util/BrowserPathHelper");
8
8
  /**
9
9
  * How a selected track should be navigated, decided purely from its shape:
10
10
  * - `contextual` — a playable track carrying its parent queue context in a
11
- * contextual URL (`{parentPath}?__trackId={src}`); expand/skip within that queue.
12
- * - `browse` — a browsable track (has a `url` that isn't contextual); drill in.
13
- * - `playable` — a bare playable track (`src`, no `url`); load and play it alone.
14
- * - `invalid` — neither `url` nor `src`; nothing to do.
11
+ * contextual path (`{parentPath}?__trackId={src}`); expand/skip within that queue.
12
+ * - `browse` — a browsable track (has a `path` that isn't contextual); drill in.
13
+ * - `playable` — a bare playable track (`src`, no `path`); load and play it alone.
14
+ * - `invalid` — neither `path` nor `src`; nothing to do.
15
15
  */
16
16
 
17
17
  /**
@@ -20,15 +20,15 @@ var _BrowserPathHelper = require("../util/BrowserPathHelper");
20
20
  * caller; this only decides which action applies.
21
21
  */
22
22
  function classifyTrackNavigation(track) {
23
- const url = track.url;
24
- if (url && _BrowserPathHelper.BrowserPathHelper.isContextual(url)) {
23
+ const path = track.path;
24
+ if (path && _BrowserPathHelper.BrowserPathHelper.isContextual(path)) {
25
25
  return {
26
26
  kind: 'contextual',
27
- parentPath: _BrowserPathHelper.BrowserPathHelper.stripTrackId(url),
28
- trackId: _BrowserPathHelper.BrowserPathHelper.extractTrackId(url)
27
+ parentPath: _BrowserPathHelper.BrowserPathHelper.stripTrackId(path),
28
+ trackId: _BrowserPathHelper.BrowserPathHelper.extractTrackId(path)
29
29
  };
30
30
  }
31
- if (url) return {
31
+ if (path) return {
32
32
  kind: 'browse'
33
33
  };
34
34
  if (track.src) return {
@@ -1 +1 @@
1
- {"version":3,"names":["_BrowserPathHelper","require","classifyTrackNavigation","track","url","BrowserPathHelper","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;;;;;AACA,IAAAA,kBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,GAAG,GAAGD,KAAK,CAACC,GAAG;EACrB,IAAIA,GAAG,IAAIC,oCAAiB,CAACC,YAAY,CAACF,GAAG,CAAC,EAAE;IAC9C,OAAO;MACLG,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEH,oCAAiB,CAACI,YAAY,CAACL,GAAG,CAAC;MAC/CM,OAAO,EAAEL,oCAAiB,CAACM,cAAc,CAACP,GAAG;IAC/C,CAAC;EACH;EACA,IAAIA,GAAG,EAAE,OAAO;IAAEG,IAAI,EAAE;EAAS,CAAC;EAClC,IAAIJ,KAAK,CAACS,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}
1
+ {"version":3,"names":["_BrowserPathHelper","require","classifyTrackNavigation","track","path","BrowserPathHelper","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;;;;;AACA,IAAAA,kBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,IAAI,GAAGD,KAAK,CAACC,IAAI;EACvB,IAAIA,IAAI,IAAIC,oCAAiB,CAACC,YAAY,CAACF,IAAI,CAAC,EAAE;IAChD,OAAO;MACLG,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEH,oCAAiB,CAACI,YAAY,CAACL,IAAI,CAAC;MAChDM,OAAO,EAAEL,oCAAiB,CAACM,cAAc,CAACP,IAAI;IAChD,CAAC;EACH;EACA,IAAIA,IAAI,EAAE,OAAO;IAAEG,IAAI,EAAE;EAAS,CAAC;EACnC,IAAIJ,KAAK,CAACS,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}
@@ -0,0 +1,89 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.flattenSections = flattenSections;
7
+ exports.flattenedChildren = flattenedChildren;
8
+ exports.normalizePage = normalizePage;
9
+ exports.sectionContaining = sectionContaining;
10
+ var _getTrackIdentity = require("../../utils/getTrackIdentity");
11
+ /**
12
+ * Normalizes a resolved page to the canonical sectioned shape (ADR 0010):
13
+ * `sections` wins when present; plain `children` is authoring sugar for one
14
+ * untitled section. The output never carries `children` — there is exactly
15
+ * one structure downstream code hydrates, transforms, and scopes against.
16
+ */
17
+ function normalizePage(content) {
18
+ const {
19
+ children,
20
+ sections,
21
+ ...rest
22
+ } = content;
23
+ const normalized = sections ?? (children !== undefined ? [{
24
+ children
25
+ }] : undefined);
26
+ return {
27
+ ...rest,
28
+ sections: normalized
29
+ };
30
+ }
31
+
32
+ /**
33
+ * The page's children concatenated in section order — the flattening that
34
+ * defines the contextual `__index` positions (ADR 0009/0010) and the flat
35
+ * views (tabs, search) of a sectioned page.
36
+ */
37
+ function flattenSections(sections) {
38
+ return sections?.flatMap(section => section.children) ?? [];
39
+ }
40
+
41
+ /**
42
+ * The page's tracks as one flat list, normalizing first — the flat view
43
+ * (tabs, search) of a page in either authored shape. Mirrors the native
44
+ * `flattenedChildren` accessors.
45
+ */
46
+ function flattenedChildren(page) {
47
+ return flattenSections(normalizePage(page).sections);
48
+ }
49
+
50
+ /**
51
+ * The section of the page containing the playable `trackId` (a track
52
+ * identity: id when non-blank, else src), or undefined when not found.
53
+ *
54
+ * `tappedIndex` — the flat page position stamped into the contextual URL —
55
+ * is a tie-breaker, never an identifier: when the child at that position
56
+ * still carries the tapped identity, it pins which section (and which copy,
57
+ * via `tappedOffset`) was tapped; when it doesn't (the list shifted),
58
+ * resolution falls back to the first section containing the identity. A
59
+ * stale index can therefore never select a different track — at worst a
60
+ * different copy of the same one.
61
+ */
62
+ function sectionContaining(sections, trackId, tappedIndex) {
63
+ if (tappedIndex !== undefined && tappedIndex >= 0) {
64
+ let start = 0;
65
+ for (const section of sections) {
66
+ const offset = tappedIndex - start;
67
+ if (offset < section.children.length) {
68
+ const tapped = section.children[offset];
69
+ if (tapped && (0, _getTrackIdentity.getTrackIdentity)(tapped) === trackId) {
70
+ return {
71
+ tracks: section.children,
72
+ tappedOffset: offset
73
+ };
74
+ }
75
+ break;
76
+ }
77
+ start += section.children.length;
78
+ }
79
+ }
80
+ for (const section of sections) {
81
+ if (section.children.some(track => (0, _getTrackIdentity.getTrackIdentity)(track) === trackId)) {
82
+ return {
83
+ tracks: section.children
84
+ };
85
+ }
86
+ }
87
+ return undefined;
88
+ }
89
+ //# sourceMappingURL=sections.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["_getTrackIdentity","require","normalizePage","content","children","sections","rest","normalized","undefined","flattenSections","flatMap","section","flattenedChildren","page","sectionContaining","trackId","tappedIndex","start","offset","length","tapped","getTrackIdentity","tracks","tappedOffset","some","track"],"sourceRoot":"../../../../src","sources":["web/browser/sections.ts"],"mappings":";;;;;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,aAAaA,CAACC,OAAsB,EAAiB;EACnE,MAAM;IAAEC,QAAQ;IAAEC,QAAQ;IAAE,GAAGC;EAAK,CAAC,GAAGH,OAAO;EAC/C,MAAMI,UAAU,GACdF,QAAQ,KAAKD,QAAQ,KAAKI,SAAS,GAAG,CAAC;IAAEJ;EAAS,CAAC,CAAC,GAAGI,SAAS,CAAC;EACnE,OAAO;IAAE,GAAGF,IAAI;IAAED,QAAQ,EAAEE;EAAW,CAAC;AAC1C;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASE,eAAeA,CAACJ,QAA+B,EAAW;EACxE,OAAOA,QAAQ,EAAEK,OAAO,CAAEC,OAAO,IAAKA,OAAO,CAACP,QAAQ,CAAC,IAAI,EAAE;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACO,SAASQ,iBAAiBA,CAACC,IAAmB,EAAW;EAC9D,OAAOJ,eAAe,CAACP,aAAa,CAACW,IAAI,CAAC,CAACR,QAAQ,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASS,iBAAiBA,CAC/BT,QAAmB,EACnBU,OAAe,EACfC,WAA+B,EACyB;EACxD,IAAIA,WAAW,KAAKR,SAAS,IAAIQ,WAAW,IAAI,CAAC,EAAE;IACjD,IAAIC,KAAK,GAAG,CAAC;IACb,KAAK,MAAMN,OAAO,IAAIN,QAAQ,EAAE;MAC9B,MAAMa,MAAM,GAAGF,WAAW,GAAGC,KAAK;MAClC,IAAIC,MAAM,GAAGP,OAAO,CAACP,QAAQ,CAACe,MAAM,EAAE;QACpC,MAAMC,MAAM,GAAGT,OAAO,CAACP,QAAQ,CAACc,MAAM,CAAC;QACvC,IAAIE,MAAM,IAAI,IAAAC,kCAAgB,EAACD,MAAM,CAAC,KAAKL,OAAO,EAAE;UAClD,OAAO;YAAEO,MAAM,EAAEX,OAAO,CAACP,QAAQ;YAAEmB,YAAY,EAAEL;UAAO,CAAC;QAC3D;QACA;MACF;MACAD,KAAK,IAAIN,OAAO,CAACP,QAAQ,CAACe,MAAM;IAClC;EACF;EACA,KAAK,MAAMR,OAAO,IAAIN,QAAQ,EAAE;IAC9B,IAAIM,OAAO,CAACP,QAAQ,CAACoB,IAAI,CAAEC,KAAK,IAAK,IAAAJ,kCAAgB,EAACI,KAAK,CAAC,KAAKV,OAAO,CAAC,EAAE;MACzE,OAAO;QAAEO,MAAM,EAAEX,OAAO,CAACP;MAAS,CAAC;IACrC;EACF;EACA,OAAOI,SAAS;AAClB","ignoreList":[]}
@@ -44,6 +44,11 @@ function applyImageQueryParams(config, imgParams, context) {
44
44
  };
45
45
  }
46
46
 
47
+ /** Whether `after` carries a header `before` had not already set identically. */
48
+ function addsHeaders(before, after) {
49
+ if (!after) return false;
50
+ return Object.entries(after).some(([key, value]) => before?.[key] !== value);
51
+ }
47
52
  /**
48
53
  * Builds and merges request configurations.
49
54
  * Mirrors Android's RequestConfigBuilder.kt
@@ -84,7 +89,9 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
84
89
  * A layer with a transform wins completely — it receives the base (plus route
85
90
  * params) and its result replaces the base; the layer's own static fields are
86
91
  * ignored. A layer without a transform merges its static fields over the base.
87
- * `path` is carried from the base — only a transform may change it.
92
+ * `path` is carried from the base — only a transform may change it. A
93
+ * throwing transform falls back to the base, so the layer is skipped and the
94
+ * ladder continues.
88
95
  *
89
96
  * Mirrors native's BrowserManager.applyLayer so web resolves the shared
90
97
  * `request` → `<kind>` → route chain identically across platforms.
@@ -95,10 +102,21 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
95
102
  // its result replaces it. When both are set they run as a pipeline — async
96
103
  // first, then sync (mirrors native applyLayer).
97
104
  if (layer.transform || layer.transformSync) {
98
- let cfg = base;
99
- if (layer.transform) cfg = await layer.transform(cfg, params);
100
- if (layer.transformSync) cfg = layer.transformSync(cfg, params);
101
- return cfg;
105
+ try {
106
+ let cfg = base;
107
+ if (layer.transform) cfg = await layer.transform(cfg, params);
108
+ if (layer.transformSync) cfg = layer.transformSync(cfg, params);
109
+ return cfg;
110
+ } catch (e) {
111
+ // A throwing transform costs its own layer, not the ladder: the layers
112
+ // under it stand, so a relative path still gets the shared `baseUrl`
113
+ // and a media request keeps the shared credential. One catch around
114
+ // the pair, as native has it, so a sync stage that throws after a
115
+ // successful async one also falls back to the layer's input rather
116
+ // than to a half-applied config.
117
+ console.error('Failed to apply transform function, using base config', e);
118
+ return base;
119
+ }
102
120
  }
103
121
  return {
104
122
  method: layer.method ?? base.method,
@@ -141,31 +159,103 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
141
159
  };
142
160
  },
143
161
  /**
144
- * Resolves a media URL using the media configuration.
145
- * Creates a RequestConfig with the track's src as the path, then builds the URL.
146
- * Supports the transform callback for URL manipulation.
162
+ * Resolves a media request from the layered configuration, returning the
163
+ * whole request rather than just its URL.
164
+ *
165
+ * The layers resolve headers (and a user agent) alongside the URL, and the
166
+ * media request needs all of them: native applies them to the AVURLAsset /
167
+ * ExoPlayer DataSpec, so web has to apply them to Shaka's requests or the
168
+ * same configuration authenticates on iOS and Android but 401s here.
147
169
  *
148
- * The shared `request` layer is applied first (its transform runs for media
149
- * too, per the documented contract — e.g. a dynamic baseUrl), then the media
150
- * transform / static fields on top. Mirrors native's resolveMediaUrl,
151
- * including its best-effort behaviour: if a transform throws, fall back to the
152
- * original `src` rather than failing the load.
170
+ * The resolved URL is returned in `path`, with `baseUrl` already folded into
171
+ * it. Best-effort throughout, but at two levels: a throwing transform or
172
+ * resolver costs only its own layer (see {@link applyLayer}), and the catch
173
+ * here is the backstop for anything left — a malformed `baseUrl` reaching
174
+ * `buildUrl`, say — which falls back to the bare `src`.
175
+ *
176
+ * The chain is `request` → `media` → `media.resolve(track)`, matching
177
+ * native's. See {@link applyMediaResolve} for why the per-track resolver goes
178
+ * last.
153
179
  *
154
180
  * @param src The track's src value (may be relative or absolute)
155
181
  * @param requestConfig The shared request configuration (applied first)
156
182
  * @param mediaConfig The media request configuration
157
- * @returns The resolved absolute URL
183
+ * @param track The track being loaded, for `media.resolve`; without it the
184
+ * per-track layer is skipped and the static layers stand
185
+ * @returns The resolved request, its URL in `path`
158
186
  */
159
- async resolveMediaUrl(src, requestConfig, mediaConfig) {
187
+ async resolveMediaRequest(src, requestConfig, mediaConfig, track) {
160
188
  try {
161
- const config = await this.applyLayers({
189
+ // The layers are applied one at a time rather than through `applyLayers`
190
+ // so the media layer's own header contribution stays visible; each
191
+ // transform still runs exactly once.
192
+ const shared = await this.applyLayer({
162
193
  path: src
163
- }, [requestConfig, mediaConfig]);
164
- return _BrowserPathHelper.BrowserPathHelper.buildUrl(config.baseUrl, config.path ?? src);
194
+ }, requestConfig);
195
+ const layered = await this.applyLayer(shared, mediaConfig);
196
+ const config = await this.applyMediaResolve(layered, mediaConfig, track);
197
+ // buildUrl folds in baseUrl *and* appends `query`; both are cleared on
198
+ // the way out so the resolved url can't be rebuilt and double-applied.
199
+ return {
200
+ ...config,
201
+ baseUrl: undefined,
202
+ query: undefined,
203
+ path: this.buildUrl({
204
+ ...config,
205
+ path: config.path ?? src
206
+ }),
207
+ mediaLayerHeaders: addsHeaders(shared.headers, config.headers)
208
+ };
165
209
  } catch (e) {
166
210
  console.error('Failed to resolve media URL, using original src', e);
167
- return _BrowserPathHelper.BrowserPathHelper.buildUrl(undefined, src);
211
+ return {
212
+ path: _BrowserPathHelper.BrowserPathHelper.buildUrl(undefined, src),
213
+ mediaLayerHeaders: false
214
+ };
215
+ }
216
+ },
217
+ /**
218
+ * Applies `media.resolve(track)` / `media.resolveSync(track)` as the final,
219
+ * most-specific layer over an already request+media-layered config. A no-op
220
+ * without a track or a resolver, so the layers stand on their own.
221
+ *
222
+ * Last, not first: native runs the media layer's transform and then lets the
223
+ * per-track resolver win over the result (Android `applyMediaResolve`, iOS
224
+ * `applyMediaResolveLayer`), so a resolver minting a signed URL is not
225
+ * overwritten by the static layer that shaped the unsigned one. Override-wins
226
+ * on every field, `path` included — replacing the URL outright is the point.
227
+ *
228
+ * A throwing resolver falls back to the layered config, as native does: the
229
+ * per-track shaping is lost, the layers under it are not.
230
+ */
231
+ async applyMediaResolve(layered, mediaConfig, track) {
232
+ if (!track || !mediaConfig) return layered;
233
+ if (!mediaConfig.resolve && !mediaConfig.resolveSync) return layered;
234
+ try {
235
+ const resolved = await this.composeResolved(mediaConfig, track);
236
+ return resolved ? this.mergeConfig(layered, resolved) : layered;
237
+ } catch (e) {
238
+ console.error('Failed to apply media.resolve, using layered config', e);
239
+ return layered;
240
+ }
241
+ },
242
+ /**
243
+ * Runs a config's per-track resolvers and composes their output: async
244
+ * `resolve` first, then `resolveSync` merged over it, sync winning.
245
+ * `undefined` when neither is set or neither produced a config.
246
+ *
247
+ * Media and artwork share the pairing, so it lives here rather than in both
248
+ * — the same reason native has `composeResolved`. Errors are the callers' to
249
+ * handle: the two paths differ on what a throwing resolver costs.
250
+ */
251
+ async composeResolved(config, track) {
252
+ let resolved;
253
+ if (config.resolve) resolved = await config.resolve(track);
254
+ if (config.resolveSync) {
255
+ const sync = config.resolveSync(track);
256
+ resolved = resolved ? this.mergeConfig(resolved, sync) : sync;
168
257
  }
258
+ return resolved;
169
259
  },
170
260
  /**
171
261
  * Resolves an artwork URL and creates an ImageSource.
@@ -249,14 +339,7 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
249
339
 
250
340
  // Step 1: Per-track resolution — async `resolve` first, then `resolveSync`
251
341
  // merged over it (mirrors native).
252
- let resolvedConfig;
253
- if (artworkConfig.resolve) {
254
- resolvedConfig = await artworkConfig.resolve(track);
255
- }
256
- if (artworkConfig.resolveSync) {
257
- const r = artworkConfig.resolveSync(track);
258
- resolvedConfig = resolvedConfig ? this.mergeConfig(resolvedConfig, r) : r;
259
- }
342
+ const resolvedConfig = await this.composeResolved(artworkConfig, track);
260
343
  // If a resolver ran but produced nothing and there's no artwork URL, no artwork
261
344
  if ((artworkConfig.resolve || artworkConfig.resolveSync) && !resolvedConfig && artworkUrl === undefined) {
262
345
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"names":["_artwork","require","_BrowserPathHelper","appendQueryParams","url","query","Object","keys","length","params","URLSearchParams","key","value","entries","undefined","append","String","queryString","toString","separator","includes","applyImageQueryParams","config","imgParams","context","width","height","RequestConfigBuilder","exports","buildUrl","path","baseUrl","BrowserPathHelper","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","applyLayer","layer","transform","transformSync","cfg","applyLayers","layers","merged","toRequestConfig","resolveMediaUrl","src","requestConfig","mediaConfig","e","console","error","resolveArtworkSource","artworkUrl","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","track","imageContext","resolveArtworkUrl","artwork","baseConfig","resolvedConfig","resolve","resolveSync","r","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_artwork","require","_BrowserPathHelper","appendQueryParams","url","query","Object","keys","length","params","URLSearchParams","key","value","entries","undefined","append","String","queryString","toString","separator","includes","applyImageQueryParams","config","imgParams","context","width","height","addsHeaders","before","after","some","RequestConfigBuilder","exports","buildUrl","path","baseUrl","BrowserPathHelper","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","applyLayer","layer","transform","transformSync","cfg","e","console","error","applyLayers","layers","merged","toRequestConfig","resolveMediaRequest","src","requestConfig","mediaConfig","track","shared","layered","applyMediaResolve","mediaLayerHeaders","resolve","resolveSync","resolved","composeResolved","sync","resolveArtworkSource","artworkUrl","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","imageContext","resolveArtworkUrl","artwork","baseConfig","resolvedConfig","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}