react-native-audio-browser 0.2.0-next.7 → 0.2.0-next.71

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 (1223) hide show
  1. package/README.md +66 -39
  2. package/android/build.gradle +58 -15
  3. package/android/gradle.properties +3 -3
  4. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +213 -0
  5. package/android/src/main/AndroidManifest.xml +14 -1
  6. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +592 -438
  7. package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +34 -0
  8. package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +16 -2
  9. package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
  10. package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +126 -0
  11. package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
  12. package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +163 -0
  13. package/android/src/main/java/com/audiobrowser/Service.kt +77 -82
  14. package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +44 -0
  15. package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
  16. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +30 -14
  17. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +345 -537
  18. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +37 -68
  19. package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +228 -0
  20. package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
  21. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +86 -64
  22. package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
  23. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +52 -29
  24. package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
  25. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
  26. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
  27. package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
  28. package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
  29. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -11
  30. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +18 -0
  31. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +11 -0
  32. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +25 -17
  33. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +18 -40
  34. package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +23 -0
  35. package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +12 -13
  36. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +32 -27
  37. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
  38. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
  39. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
  40. package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +65 -0
  41. package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
  42. package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +63 -0
  43. package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +16 -19
  44. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +23 -34
  45. package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
  46. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +38 -27
  47. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +585 -342
  48. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +108 -153
  49. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +102 -117
  50. package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
  51. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +47 -37
  52. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +123 -136
  53. package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
  54. package/android/src/main/java/com/audiobrowser/player/Player.kt +425 -566
  55. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
  56. package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +14 -21
  57. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +69 -120
  58. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +51 -122
  59. package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +24 -0
  60. package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
  61. package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
  62. package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
  63. package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +32 -67
  64. package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
  65. package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +65 -0
  66. package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +101 -0
  67. package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
  68. package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +117 -0
  69. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +690 -0
  70. package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +105 -0
  71. package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +39 -0
  72. package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +59 -0
  73. package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +91 -0
  74. package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +98 -0
  75. package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +69 -0
  76. package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +128 -0
  77. package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +538 -0
  78. package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +97 -0
  79. package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +200 -0
  80. package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
  81. package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +67 -0
  82. package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
  83. package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +68 -0
  84. package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +61 -0
  85. package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +70 -0
  86. package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +62 -43
  87. package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +151 -0
  88. package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +53 -18
  89. package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +26 -13
  90. package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +231 -77
  91. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
  92. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +39 -0
  93. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
  94. package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -15
  95. package/android/src/main/java/com/audiobrowser/util/Automotive.kt +13 -0
  96. package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
  97. package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
  98. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +50 -93
  99. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
  100. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
  101. package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
  102. package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
  103. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +25 -24
  104. package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +10 -10
  105. package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +27 -56
  106. package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +39 -46
  107. package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
  108. package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -7
  109. package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
  110. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
  111. package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
  112. package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
  113. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +96 -82
  114. package/android/src/main/res/values/strings.xml +25 -5
  115. package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +16 -0
  116. package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +151 -0
  117. package/android/src/test/java/com/audiobrowser/LaunchSettledTest.kt +81 -0
  118. package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +103 -0
  119. package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +39 -0
  120. package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +88 -0
  121. package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +287 -0
  122. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -43
  123. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
  124. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
  125. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +143 -0
  126. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +172 -0
  127. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -23
  128. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +314 -8
  129. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +69 -13
  130. package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +292 -0
  131. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -4
  132. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +163 -0
  133. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +116 -55
  134. package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
  135. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +149 -0
  136. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +37 -0
  137. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +36 -0
  138. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
  139. package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
  140. package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +35 -0
  141. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +460 -0
  142. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +4 -14
  143. package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +87 -0
  144. package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
  145. package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -9
  146. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
  147. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +137 -0
  148. package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
  149. package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
  150. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +226 -21
  151. package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +2 -26
  152. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +53 -39
  153. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +50 -0
  154. package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
  155. package/android/src/test/java/com/audiobrowser/player/PlayerBrowserTest.kt +62 -0
  156. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +172 -0
  157. package/android/src/test/java/com/audiobrowser/player/PlayerDestroyTest.kt +60 -0
  158. package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
  159. package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +66 -0
  160. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +353 -0
  161. package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +93 -0
  162. package/android/src/test/java/com/audiobrowser/player/PlayerSleepTimerTest.kt +38 -0
  163. package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +235 -0
  164. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +190 -0
  165. package/android/src/test/java/com/audiobrowser/player/PlayerTrackChangeTest.kt +46 -0
  166. package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +34 -72
  167. package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
  168. package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +72 -0
  169. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +149 -0
  170. package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
  171. package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
  172. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +285 -0
  173. package/android/src/test/java/com/audiobrowser/remote/RemoteItemTest.kt +61 -0
  174. package/android/src/test/java/com/audiobrowser/remote/RemoteOutputsControllerTest.kt +77 -0
  175. package/android/src/test/java/com/audiobrowser/remote/RemoteQueueTest.kt +101 -0
  176. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +926 -0
  177. package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +201 -0
  178. package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +89 -0
  179. package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +70 -0
  180. package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +134 -0
  181. package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +169 -0
  182. package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +176 -0
  183. package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +690 -0
  184. package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
  185. package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +167 -0
  186. package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
  187. package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +200 -0
  188. package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +97 -0
  189. package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
  190. package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +181 -15
  191. package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +315 -8
  192. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +298 -0
  193. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +78 -1
  194. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
  195. package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
  196. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +51 -16
  197. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
  198. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
  199. package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
  200. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +154 -0
  201. package/android/src/test/java/com/audiobrowser/util/NetworkConnectivityMonitorTest.kt +99 -0
  202. package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +97 -0
  203. package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -10
  204. package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
  205. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +11 -13
  206. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +91 -1
  207. package/android/src/test/resources/sonos/device_description.xml +78 -0
  208. package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +56 -0
  209. package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +80 -0
  210. package/ios/AVPlayerEngine.swift +354 -0
  211. package/ios/AVPlayerEngineCallbacks.swift +12 -0
  212. package/ios/Browser/BrowseGate.swift +57 -0
  213. package/ios/Browser/BrowserConfig.swift +123 -104
  214. package/ios/Browser/BrowserError.swift +15 -0
  215. package/ios/Browser/BrowserManager.swift +153 -675
  216. package/ios/Browser/BrowserPathHelper.swift +54 -117
  217. package/ios/Browser/FavoriteSet.swift +43 -0
  218. package/ios/Browser/InertStyleDiagnostic.swift +231 -0
  219. package/ios/Browser/JsonModels.swift +244 -335
  220. package/ios/Browser/NavigationErrorState.swift +42 -0
  221. package/ios/Browser/PageResolver.swift +137 -0
  222. package/ios/Browser/RequestLayer.swift +181 -0
  223. package/ios/Browser/RequestPipeline.swift +293 -0
  224. package/ios/Browser/SearchDrillIn.swift +11 -17
  225. package/ios/Browser/SectionScope.swift +73 -26
  226. package/ios/Browser/SimpleRouter.swift +76 -154
  227. package/ios/Browser/StyleResolver.swift +41 -0
  228. package/ios/Browser/TabBarEntries.swift +8 -7
  229. package/ios/Browser/TrackIdTemplate.swift +29 -0
  230. package/ios/CarPlay/CPInterfaceController+Safe.swift +102 -61
  231. package/ios/CarPlay/CarPlayArtworkResolver.swift +32 -83
  232. package/ios/CarPlay/CarPlayController.swift +37 -1297
  233. package/ios/CarPlay/CarPlayImageLoader.swift +85 -172
  234. package/ios/CarPlay/CarPlayListItemFactory.swift +240 -104
  235. package/ios/CarPlay/CarPlayNowPlayingManager.swift +129 -204
  236. package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
  237. package/ios/CarPlay/CarPlaySession+PageLoader.swift +92 -0
  238. package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
  239. package/ios/CarPlay/CarPlaySession+TabBar.swift +185 -0
  240. package/ios/CarPlay/CarPlaySession.swift +203 -0
  241. package/ios/CarPlay/CarPlayTemplates.swift +62 -0
  242. package/ios/CarPlay/IntentHandlers.swift +94 -0
  243. package/ios/CarPlay/MediaIntentCriteria.swift +91 -0
  244. package/ios/CarPlay/MediaIntentHandler.swift +63 -0
  245. package/ios/CarPlay/MediaIntentPlayback.swift +75 -0
  246. package/ios/CarPlay/NowPlayingButtonRules.swift +34 -0
  247. package/ios/CarPlay/RNABAudioBrowser.m +7 -15
  248. package/ios/CarPlay/SectionPresentation.swift +67 -0
  249. package/ios/CarPlay/TopTemplateReplacer.swift +95 -0
  250. package/ios/Extension/Capability+RemoteCommand.swift +22 -69
  251. package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
  252. package/ios/Extension/CxxVectorConformances.swift +4 -16
  253. package/ios/Extension/NavigationError+Conversion.swift +17 -10
  254. package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -16
  255. package/ios/Extension/RequestConfig+Copying.swift +2 -6
  256. package/ios/Extension/ResolvedTrack+Copying.swift +14 -22
  257. package/ios/Extension/SearchParams+Query.swift +28 -0
  258. package/ios/Extension/Section+Copying.swift +26 -0
  259. package/ios/Extension/String+IcyCharset.swift +21 -0
  260. package/ios/Extension/TimedMetadata+AVFoundation.swift +10 -14
  261. package/ios/Extension/Track+AVPlayer.swift +1 -18
  262. package/ios/Extension/Track+Copying.swift +13 -21
  263. package/ios/Extension/Track+Identity.swift +20 -0
  264. package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
  265. package/ios/Extension/UIApplication+ActiveScene.swift +19 -0
  266. package/ios/Extension/UIImage+Adaptive.swift +12 -0
  267. package/ios/Extension/URLError+Connectivity.swift +15 -0
  268. package/ios/Extension/Variant+Artwork.swift +8 -22
  269. package/ios/Http/HttpClient.swift +73 -167
  270. package/ios/HybridAudioBrowser+Browser.swift +134 -0
  271. package/ios/HybridAudioBrowser+Options.swift +116 -0
  272. package/ios/HybridAudioBrowser+Player.swift +337 -0
  273. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +156 -0
  274. package/ios/HybridAudioBrowser+Stubs.swift +44 -0
  275. package/ios/HybridAudioBrowser.swift +148 -1688
  276. package/ios/Model/NitroTypeStubs.swift +240 -32
  277. package/ios/Model/PlayerUpdateOptions.swift +13 -19
  278. package/ios/Model/RemoteCommand.swift +6 -60
  279. package/ios/Model/TrackPlayerError.swift +14 -23
  280. package/ios/NowPlayingInfo/NowPlayingInfoController.swift +28 -82
  281. package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
  282. package/ios/Observer/ItemObserver.swift +92 -0
  283. package/ios/Observer/PlayerObserver.swift +59 -0
  284. package/ios/Option/SessionCategories.swift +42 -92
  285. package/ios/PlaybackEvent.swift +4 -2
  286. package/ios/Player/AirPlayStallJudgement.swift +7 -9
  287. package/ios/Player/AudioSessionController.swift +190 -0
  288. package/ios/Player/DeferredSeek.swift +73 -0
  289. package/ios/Player/EndOfTrackJudgement.swift +6 -13
  290. package/ios/Player/ErrorStatus.swift +52 -0
  291. package/ios/Player/MediaLoader.swift +73 -98
  292. package/ios/Player/NowPlayingLines.swift +49 -0
  293. package/ios/Player/NowPlayingUpdater.swift +175 -105
  294. package/ios/Player/PersistedPlaybackState.swift +1 -2
  295. package/ios/Player/PlaybackFailure.swift +121 -0
  296. package/ios/Player/PlaybackPersistence.swift +72 -0
  297. package/ios/Player/PlaybackStateMachine.swift +11 -11
  298. package/ios/Player/PlaybackTimer.swift +11 -8
  299. package/ios/Player/Player.swift +991 -0
  300. package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
  301. package/ios/Player/PlayerEngine.swift +105 -0
  302. package/ios/Player/PlayerStatusTypes.swift +1 -6
  303. package/ios/Player/QueueManager.swift +80 -98
  304. package/ios/Player/RetryLoop.swift +274 -0
  305. package/ios/Player/ShuffleOrder.swift +36 -43
  306. package/ios/Player/SleepTimerManager.swift +25 -42
  307. package/ios/Player/VolumeFader.swift +20 -15
  308. package/ios/RemoteCommand/RemoteCommandCallbacks.swift +33 -0
  309. package/ios/RemoteCommand/RemoteCommandController.swift +101 -336
  310. package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
  311. package/ios/Tests/ArtworkFreshnessTests.swift +67 -0
  312. package/ios/Tests/BrowserPathHelperTests.swift +89 -18
  313. package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
  314. package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
  315. package/ios/Tests/ConcurrentMapTests.swift +42 -0
  316. package/ios/Tests/DeferredSeekTests.swift +76 -0
  317. package/ios/Tests/EmitterTests.swift +22 -39
  318. package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
  319. package/ios/Tests/ErrorStatusTests.swift +50 -0
  320. package/ios/Tests/FavoriteSetTests.swift +61 -0
  321. package/ios/Tests/GenerationMemoTests.swift +121 -0
  322. package/ios/Tests/InertStyleDiagnosticTests.swift +203 -0
  323. package/ios/Tests/JsonModelsTests.swift +189 -3
  324. package/ios/Tests/LRUCacheTests.swift +106 -0
  325. package/ios/Tests/MediaIntentCriteriaTests.swift +58 -52
  326. package/ios/Tests/MediaLoaderTests.swift +38 -78
  327. package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
  328. package/ios/Tests/NowPlayingLinesTests.swift +66 -0
  329. package/ios/Tests/ObserverTests.swift +88 -0
  330. package/ios/Tests/PlaybackErrorTests.swift +74 -0
  331. package/ios/Tests/PlaybackFailureTests.swift +181 -0
  332. package/ios/Tests/PlaybackPersistenceTests.swift +94 -0
  333. package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
  334. package/ios/Tests/PlaybackTimerTests.swift +2 -3
  335. package/ios/Tests/PlayerInvalidTrackTests.swift +65 -0
  336. package/ios/Tests/PlayerPolicyTests.swift +547 -0
  337. package/ios/Tests/PlayerTests.swift +1590 -0
  338. package/ios/Tests/PlayingStateTests.swift +41 -0
  339. package/ios/Tests/QueueManagerTests.swift +205 -174
  340. package/ios/Tests/ReadyValueTests.swift +73 -0
  341. package/ios/Tests/RemoteCommandControllerTests.swift +173 -0
  342. package/ios/Tests/RequestLayerTests.swift +228 -0
  343. package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -37
  344. package/ios/Tests/RetryLoopTests.swift +282 -0
  345. package/ios/Tests/SearchDrillInTests.swift +16 -17
  346. package/ios/Tests/SearchParamsQueryTests.swift +48 -0
  347. package/ios/Tests/SectionPresentationTests.swift +85 -0
  348. package/ios/Tests/SectionScopeTests.swift +136 -54
  349. package/ios/Tests/SimpleRouterTests.swift +39 -8
  350. package/ios/Tests/SleepTimerManagerTests.swift +68 -47
  351. package/ios/Tests/StyleResolverTests.swift +123 -0
  352. package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
  353. package/ios/Tests/Support/TestTypes.swift +135 -100
  354. package/ios/Tests/TabBarEntriesTests.swift +19 -21
  355. package/ios/Tests/TimedMetadataAVFoundationTests.swift +43 -2
  356. package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
  357. package/ios/Tests/TrackIdTemplateTests.swift +63 -0
  358. package/ios/Tests/TrackIdentityTests.swift +20 -0
  359. package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
  360. package/ios/Tests/TrackSelectorTests.swift +157 -34
  361. package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
  362. package/ios/TrackSelector.swift +62 -77
  363. package/ios/Util/ArtworkFreshness.swift +42 -0
  364. package/ios/Util/ArtworkImageFetcher.swift +143 -6
  365. package/ios/Util/ConcurrentMap.swift +19 -0
  366. package/ios/Util/Emitter.swift +45 -22
  367. package/ios/Util/GenerationMemo.swift +36 -0
  368. package/ios/Util/LRUCache.swift +23 -159
  369. package/ios/Util/NetworkMonitor.swift +31 -33
  370. package/ios/Util/OutputPicker.swift +48 -0
  371. package/ios/Util/ReadyValue.swift +57 -0
  372. package/ios/Util/SFSymbolRenderer.swift +64 -49
  373. package/ios/Util/SVGProcessor.swift +9 -16
  374. package/lib/commonjs/AudioBrowser.js +8 -8
  375. package/lib/commonjs/AudioBrowser.js.map +1 -1
  376. package/lib/commonjs/CLAUDE.md +57 -0
  377. package/lib/commonjs/features/battery.js +16 -12
  378. package/lib/commonjs/features/battery.js.map +1 -1
  379. package/lib/commonjs/features/browser-config.js +13 -9
  380. package/lib/commonjs/features/browser-config.js.map +1 -1
  381. package/lib/commonjs/features/browser.js +78 -20
  382. package/lib/commonjs/features/browser.js.map +1 -1
  383. package/lib/commonjs/features/carConnection.js +3 -4
  384. package/lib/commonjs/features/carConnection.js.map +1 -1
  385. package/lib/commonjs/features/equalizer.js +10 -6
  386. package/lib/commonjs/features/equalizer.js.map +1 -1
  387. package/lib/commonjs/features/errors.js +35 -21
  388. package/lib/commonjs/features/errors.js.map +1 -1
  389. package/lib/commonjs/features/favorites.js +29 -24
  390. package/lib/commonjs/features/favorites.js.map +1 -1
  391. package/lib/commonjs/features/gate.js +28 -7
  392. package/lib/commonjs/features/gate.js.map +1 -1
  393. package/lib/commonjs/features/metadata.js +64 -14
  394. package/lib/commonjs/features/metadata.js.map +1 -1
  395. package/lib/commonjs/features/network.js +6 -2
  396. package/lib/commonjs/features/network.js.map +1 -1
  397. package/lib/commonjs/features/nowPlaying.js +29 -15
  398. package/lib/commonjs/features/nowPlaying.js.map +1 -1
  399. package/lib/commonjs/features/output.js +10 -5
  400. package/lib/commonjs/features/output.js.map +1 -1
  401. package/lib/commonjs/features/playback/controls.js +13 -6
  402. package/lib/commonjs/features/playback/controls.js.map +1 -1
  403. package/lib/commonjs/features/playback/playWhenReady.js +6 -5
  404. package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
  405. package/lib/commonjs/features/playback/playing.js +5 -3
  406. package/lib/commonjs/features/playback/playing.js.map +1 -1
  407. package/lib/commonjs/features/playback/progress.js +13 -6
  408. package/lib/commonjs/features/playback/progress.js.map +1 -1
  409. package/lib/commonjs/features/playback/rate.js +8 -1
  410. package/lib/commonjs/features/playback/rate.js.map +1 -1
  411. package/lib/commonjs/features/playback/state.js +5 -6
  412. package/lib/commonjs/features/playback/state.js.map +1 -1
  413. package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -7
  414. package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
  415. package/lib/commonjs/features/playback/volume.js +6 -5
  416. package/lib/commonjs/features/playback/volume.js.map +1 -1
  417. package/lib/commonjs/features/player/options.js +23 -29
  418. package/lib/commonjs/features/player/options.js.map +1 -1
  419. package/lib/commonjs/features/player/setup.js +41 -41
  420. package/lib/commonjs/features/player/setup.js.map +1 -1
  421. package/lib/commonjs/features/player/validateOptions.js +23 -0
  422. package/lib/commonjs/features/player/validateOptions.js.map +1 -0
  423. package/lib/commonjs/features/queue/activeTrack.js +15 -5
  424. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  425. package/lib/commonjs/features/queue/queue.js +58 -23
  426. package/lib/commonjs/features/queue/queue.js.map +1 -1
  427. package/lib/commonjs/features/queue/repeatMode.js +3 -2
  428. package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
  429. package/lib/commonjs/features/queue/shuffle.js +1 -2
  430. package/lib/commonjs/features/queue/shuffle.js.map +1 -1
  431. package/lib/commonjs/features/remoteControls.js +70 -125
  432. package/lib/commonjs/features/remoteControls.js.map +1 -1
  433. package/lib/commonjs/features/sleepTimer.js +24 -7
  434. package/lib/commonjs/features/sleepTimer.js.map +1 -1
  435. package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
  436. package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
  437. package/lib/commonjs/utils/LazyNativeEmitter.js +25 -14
  438. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  439. package/lib/commonjs/utils/NativeUpdatedValue.js +32 -16
  440. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  441. package/lib/commonjs/utils/getTrackIdentity.js +26 -0
  442. package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
  443. package/lib/commonjs/utils/useDebug.js +16 -3
  444. package/lib/commonjs/utils/useDebug.js.map +1 -1
  445. package/lib/commonjs/utils/useNativeUpdatedValue.js +12 -20
  446. package/lib/commonjs/utils/useNativeUpdatedValue.js.map +1 -1
  447. package/lib/commonjs/utils/useNativeValueRefreshedBy.js +38 -0
  448. package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
  449. package/lib/commonjs/web/NativeAudioBrowser.js +207 -84
  450. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  451. package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
  452. package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
  453. package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
  454. package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
  455. package/lib/commonjs/web/TrackPlayer/Player.js +256 -40
  456. package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
  457. package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
  458. package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
  459. package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
  460. package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +34 -14
  461. package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
  462. package/lib/commonjs/web/browser/BrowserManager.js +175 -100
  463. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  464. package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
  465. package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
  466. package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
  467. package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
  468. package/lib/commonjs/web/browser/SearchManager.js +18 -23
  469. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  470. package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
  471. package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
  472. package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
  473. package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
  474. package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
  475. package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
  476. package/lib/commonjs/web/browser/sections.js +89 -0
  477. package/lib/commonjs/web/browser/sections.js.map +1 -0
  478. package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
  479. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  480. package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
  481. package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
  482. package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
  483. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  484. package/lib/commonjs/web/util/BrowserPathHelper.js +60 -11
  485. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  486. package/lib/module/AudioBrowser.js +2 -1
  487. package/lib/module/AudioBrowser.js.map +1 -1
  488. package/lib/module/CLAUDE.md +57 -0
  489. package/lib/module/features/battery.js +16 -12
  490. package/lib/module/features/battery.js.map +1 -1
  491. package/lib/module/features/browser-config.js +13 -9
  492. package/lib/module/features/browser-config.js.map +1 -1
  493. package/lib/module/features/browser.js +78 -20
  494. package/lib/module/features/browser.js.map +1 -1
  495. package/lib/module/features/carConnection.js +3 -4
  496. package/lib/module/features/carConnection.js.map +1 -1
  497. package/lib/module/features/equalizer.js +10 -6
  498. package/lib/module/features/equalizer.js.map +1 -1
  499. package/lib/module/features/errors.js +35 -21
  500. package/lib/module/features/errors.js.map +1 -1
  501. package/lib/module/features/favorites.js +29 -24
  502. package/lib/module/features/favorites.js.map +1 -1
  503. package/lib/module/features/gate.js +28 -7
  504. package/lib/module/features/gate.js.map +1 -1
  505. package/lib/module/features/metadata.js +62 -14
  506. package/lib/module/features/metadata.js.map +1 -1
  507. package/lib/module/features/network.js +6 -2
  508. package/lib/module/features/network.js.map +1 -1
  509. package/lib/module/features/nowPlaying.js +29 -15
  510. package/lib/module/features/nowPlaying.js.map +1 -1
  511. package/lib/module/features/output.js +10 -5
  512. package/lib/module/features/output.js.map +1 -1
  513. package/lib/module/features/playback/controls.js +13 -6
  514. package/lib/module/features/playback/controls.js.map +1 -1
  515. package/lib/module/features/playback/playWhenReady.js +6 -5
  516. package/lib/module/features/playback/playWhenReady.js.map +1 -1
  517. package/lib/module/features/playback/playing.js +5 -3
  518. package/lib/module/features/playback/playing.js.map +1 -1
  519. package/lib/module/features/playback/progress.js +13 -6
  520. package/lib/module/features/playback/progress.js.map +1 -1
  521. package/lib/module/features/playback/rate.js +8 -1
  522. package/lib/module/features/playback/rate.js.map +1 -1
  523. package/lib/module/features/playback/state.js +5 -6
  524. package/lib/module/features/playback/state.js.map +1 -1
  525. package/lib/module/features/playback/trackPlaybackTime.js +6 -6
  526. package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
  527. package/lib/module/features/playback/volume.js +6 -5
  528. package/lib/module/features/playback/volume.js.map +1 -1
  529. package/lib/module/features/player/options.js +22 -27
  530. package/lib/module/features/player/options.js.map +1 -1
  531. package/lib/module/features/player/setup.js +40 -40
  532. package/lib/module/features/player/setup.js.map +1 -1
  533. package/lib/module/features/player/validateOptions.js +19 -0
  534. package/lib/module/features/player/validateOptions.js.map +1 -0
  535. package/lib/module/features/queue/activeTrack.js +15 -5
  536. package/lib/module/features/queue/activeTrack.js.map +1 -1
  537. package/lib/module/features/queue/queue.js +58 -23
  538. package/lib/module/features/queue/queue.js.map +1 -1
  539. package/lib/module/features/queue/repeatMode.js +3 -2
  540. package/lib/module/features/queue/repeatMode.js.map +1 -1
  541. package/lib/module/features/queue/shuffle.js +1 -2
  542. package/lib/module/features/queue/shuffle.js.map +1 -1
  543. package/lib/module/features/remoteControls.js +70 -125
  544. package/lib/module/features/remoteControls.js.map +1 -1
  545. package/lib/module/features/sleepTimer.js +25 -8
  546. package/lib/module/features/sleepTimer.js.map +1 -1
  547. package/lib/module/test-utils/reactNativeStub.js +58 -0
  548. package/lib/module/test-utils/reactNativeStub.js.map +1 -0
  549. package/lib/module/utils/LazyNativeEmitter.js +25 -14
  550. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  551. package/lib/module/utils/NativeUpdatedValue.js +32 -16
  552. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  553. package/lib/module/utils/getTrackIdentity.js +22 -0
  554. package/lib/module/utils/getTrackIdentity.js.map +1 -0
  555. package/lib/module/utils/useDebug.js +16 -3
  556. package/lib/module/utils/useDebug.js.map +1 -1
  557. package/lib/module/utils/useNativeUpdatedValue.js +13 -21
  558. package/lib/module/utils/useNativeUpdatedValue.js.map +1 -1
  559. package/lib/module/utils/useNativeValueRefreshedBy.js +34 -0
  560. package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
  561. package/lib/module/web/NativeAudioBrowser.js +207 -84
  562. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  563. package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
  564. package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
  565. package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
  566. package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
  567. package/lib/module/web/TrackPlayer/Player.js +256 -40
  568. package/lib/module/web/TrackPlayer/Player.js.map +1 -1
  569. package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
  570. package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
  571. package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
  572. package/lib/module/web/TrackPlayer/QueuePlayer.js +34 -14
  573. package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
  574. package/lib/module/web/browser/BrowserManager.js +175 -100
  575. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  576. package/lib/module/web/browser/FavoriteManager.js +31 -21
  577. package/lib/module/web/browser/FavoriteManager.js.map +1 -1
  578. package/lib/module/web/browser/NavigationErrorManager.js +3 -1
  579. package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
  580. package/lib/module/web/browser/SearchManager.js +18 -23
  581. package/lib/module/web/browser/SearchManager.js.map +1 -1
  582. package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
  583. package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
  584. package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
  585. package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
  586. package/lib/module/web/browser/parseSearchResponse.js +3 -4
  587. package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
  588. package/lib/module/web/browser/sections.js +83 -0
  589. package/lib/module/web/browser/sections.js.map +1 -0
  590. package/lib/module/web/http/RequestConfigBuilder.js +110 -27
  591. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  592. package/lib/module/web/http/followMediaRedirect.js +215 -0
  593. package/lib/module/web/http/followMediaRedirect.js.map +1 -0
  594. package/lib/module/web/player/NowPlayingManager.js +4 -3
  595. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  596. package/lib/module/web/util/BrowserPathHelper.js +60 -11
  597. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  598. package/lib/typescript/package.json +1 -0
  599. package/lib/typescript/src/AudioBrowser.d.ts +1 -1
  600. package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
  601. package/lib/typescript/src/features/battery.d.ts +17 -12
  602. package/lib/typescript/src/features/battery.d.ts.map +1 -1
  603. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  604. package/lib/typescript/src/features/browser.d.ts +67 -19
  605. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  606. package/lib/typescript/src/features/carConnection.d.ts +3 -4
  607. package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
  608. package/lib/typescript/src/features/equalizer.d.ts +10 -6
  609. package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
  610. package/lib/typescript/src/features/errors.d.ts +37 -22
  611. package/lib/typescript/src/features/errors.d.ts.map +1 -1
  612. package/lib/typescript/src/features/favorites.d.ts +29 -24
  613. package/lib/typescript/src/features/favorites.d.ts.map +1 -1
  614. package/lib/typescript/src/features/gate.d.ts +32 -10
  615. package/lib/typescript/src/features/gate.d.ts.map +1 -1
  616. package/lib/typescript/src/features/metadata.d.ts +68 -17
  617. package/lib/typescript/src/features/metadata.d.ts.map +1 -1
  618. package/lib/typescript/src/features/network.d.ts +6 -2
  619. package/lib/typescript/src/features/network.d.ts.map +1 -1
  620. package/lib/typescript/src/features/nowPlaying.d.ts +29 -15
  621. package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
  622. package/lib/typescript/src/features/output.d.ts +10 -5
  623. package/lib/typescript/src/features/output.d.ts.map +1 -1
  624. package/lib/typescript/src/features/playback/controls.d.ts +13 -6
  625. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  626. package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
  627. package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
  628. package/lib/typescript/src/features/playback/playing.d.ts +16 -3
  629. package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
  630. package/lib/typescript/src/features/playback/progress.d.ts +11 -5
  631. package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
  632. package/lib/typescript/src/features/playback/rate.d.ts +8 -1
  633. package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
  634. package/lib/typescript/src/features/playback/state.d.ts +10 -6
  635. package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
  636. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
  637. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  638. package/lib/typescript/src/features/playback/volume.d.ts +6 -5
  639. package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
  640. package/lib/typescript/src/features/player/options.d.ts +74 -57
  641. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  642. package/lib/typescript/src/features/player/setup.d.ts +110 -60
  643. package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
  644. package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
  645. package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
  646. package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -3
  647. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  648. package/lib/typescript/src/features/queue/queue.d.ts +52 -21
  649. package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
  650. package/lib/typescript/src/features/queue/repeatMode.d.ts +2 -2
  651. package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
  652. package/lib/typescript/src/features/queue/shuffle.d.ts +1 -2
  653. package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
  654. package/lib/typescript/src/features/remoteControls.d.ts +81 -47
  655. package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
  656. package/lib/typescript/src/features/sleepTimer.d.ts +16 -8
  657. package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
  658. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +3 -4
  659. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  660. package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
  661. package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
  662. package/lib/typescript/src/types/browser-native.d.ts +3 -2
  663. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  664. package/lib/typescript/src/types/browser-nodes.d.ts +401 -143
  665. package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
  666. package/lib/typescript/src/types/browser.d.ts +242 -173
  667. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  668. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +16 -16
  669. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  670. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +17 -20
  671. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  672. package/lib/typescript/src/utils/getTrackIdentity.d.ts +20 -0
  673. package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
  674. package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
  675. package/lib/typescript/src/utils/resolveAssetSource.d.ts.map +1 -1
  676. package/lib/typescript/src/utils/useDebug.d.ts +16 -3
  677. package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
  678. package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts +4 -4
  679. package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts.map +1 -1
  680. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +20 -0
  681. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
  682. package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
  683. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
  684. package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
  685. package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
  686. package/nitrogen/generated/android/c++/JAndroidOptions.hpp +2 -2
  687. package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
  688. package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
  689. package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
  690. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
  691. package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
  692. package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
  693. package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
  694. package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
  695. package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
  696. package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
  697. package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
  698. package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
  699. package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
  700. package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
  701. package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
  702. package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
  703. package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
  704. package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
  705. package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
  706. package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
  707. package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
  708. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
  709. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
  710. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
  711. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
  712. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
  713. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
  714. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
  715. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
  716. 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 +9 -9
  717. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
  718. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
  719. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
  720. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
  721. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
  722. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
  723. package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
  724. package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
  725. package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
  726. package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
  727. package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
  728. package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
  729. package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
  730. package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
  731. package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +4 -7
  732. package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
  733. package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
  734. package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
  735. package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
  736. package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
  737. package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
  738. package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
  739. package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
  740. package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
  741. package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
  742. package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
  743. package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
  744. package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
  745. package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
  746. package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
  747. package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
  748. package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
  749. package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
  750. package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
  751. package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
  752. package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
  753. package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
  754. package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
  755. package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
  756. package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
  757. package/nitrogen/generated/android/c++/JGate.hpp +2 -2
  758. package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
  759. package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
  760. package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
  761. package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
  762. package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
  763. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +77 -44
  764. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +4 -3
  765. package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
  766. package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
  767. package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
  768. package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
  769. package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
  770. package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
  771. package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
  772. package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
  773. package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
  774. package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
  775. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
  776. package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
  777. package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
  778. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
  779. package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
  780. package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
  781. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
  782. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +21 -12
  783. package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +4 -7
  784. package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
  785. package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
  786. package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
  787. package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
  788. package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +2 -2
  789. package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
  790. package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
  791. package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
  792. package/nitrogen/generated/android/c++/JOptions.hpp +4 -7
  793. package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
  794. package/nitrogen/generated/android/c++/JOutputType.hpp +8 -2
  795. package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
  796. package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
  797. package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
  798. package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
  799. package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
  800. package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
  801. package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
  802. package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
  803. package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
  804. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
  805. package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
  806. package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
  807. package/nitrogen/generated/android/c++/JRemoteButton.hpp +2 -2
  808. package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +10 -10
  809. package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
  810. package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
  811. package/nitrogen/generated/android/c++/JRemoteOutputsOptions.hpp +66 -0
  812. package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
  813. package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
  814. package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
  815. package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
  816. package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
  817. package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
  818. package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
  819. package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
  820. package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
  821. package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
  822. package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
  823. package/nitrogen/generated/android/c++/JSection.hpp +116 -0
  824. package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
  825. package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
  826. package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
  827. package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
  828. package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
  829. package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
  830. package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
  831. package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
  832. package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +18 -12
  833. package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
  834. package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
  835. package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
  836. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
  837. package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
  838. package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
  839. package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
  840. package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +3 -3
  841. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
  842. package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
  843. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
  844. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +17 -0
  845. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
  846. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
  847. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
  848. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
  849. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
  850. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
  851. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
  852. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
  853. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
  854. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
  855. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
  856. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
  857. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
  858. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
  859. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
  860. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
  861. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
  862. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
  863. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
  864. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
  865. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
  866. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
  867. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
  868. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
  869. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
  870. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
  871. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
  872. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
  873. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
  874. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
  875. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
  876. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
  877. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
  878. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
  879. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
  880. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
  881. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
  882. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
  883. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
  884. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
  885. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
  886. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
  887. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
  888. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
  889. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
  890. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
  891. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
  892. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
  893. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
  894. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
  895. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
  896. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
  897. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
  898. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
  899. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
  900. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
  901. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
  902. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
  903. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
  904. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
  905. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
  906. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
  907. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
  908. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
  909. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
  910. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
  911. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
  912. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
  913. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
  914. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +7 -1
  915. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
  916. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
  917. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
  918. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
  919. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
  920. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
  921. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
  922. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
  923. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
  924. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
  925. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
  926. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
  927. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +39 -5
  928. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
  929. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
  930. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
  931. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
  932. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +17 -0
  933. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
  934. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
  935. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
  936. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
  937. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
  938. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +3 -1
  939. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
  940. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
  941. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
  942. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
  943. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
  944. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
  945. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
  946. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
  947. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
  948. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
  949. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +17 -0
  950. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
  951. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
  952. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteOutputsOptions.kt +61 -0
  953. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
  954. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
  955. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
  956. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
  957. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
  958. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
  959. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
  960. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
  961. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
  962. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
  963. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
  964. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
  965. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
  966. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
  967. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
  968. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
  969. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
  970. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +17 -0
  971. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
  972. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
  973. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
  974. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
  975. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
  976. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
  977. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
  978. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout.kt +16 -7
  979. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
  980. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
  981. package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
  982. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
  983. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +800 -644
  984. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +31 -10
  985. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +41 -12
  986. package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
  987. package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
  988. package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
  989. package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
  990. package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
  991. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
  992. package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
  993. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +2 -1
  994. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +20 -2
  995. package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
  996. package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
  997. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
  998. package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +12 -1
  999. package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
  1000. package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
  1001. package/nitrogen/generated/ios/swift/OutputType.swift +8 -0
  1002. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
  1003. package/nitrogen/generated/ios/swift/RemoteOutputsOptions.swift +78 -0
  1004. package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
  1005. package/nitrogen/generated/ios/swift/Section.swift +82 -0
  1006. package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
  1007. package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
  1008. package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
  1009. package/nitrogen/generated/ios/swift/Track.swift +28 -63
  1010. package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
  1011. package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
  1012. package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
  1013. package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
  1014. package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +12 -0
  1015. package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
  1016. package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
  1017. package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
  1018. package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
  1019. package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
  1020. package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
  1021. package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
  1022. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +2 -1
  1023. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +2 -1
  1024. package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
  1025. package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
  1026. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
  1027. package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +9 -2
  1028. package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
  1029. package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
  1030. package/nitrogen/generated/shared/c++/OutputType.hpp +9 -1
  1031. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
  1032. package/nitrogen/generated/shared/c++/RemoteOutputsOptions.hpp +92 -0
  1033. package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
  1034. package/nitrogen/generated/shared/c++/Section.hpp +102 -0
  1035. package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
  1036. package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
  1037. package/nitrogen/generated/shared/c++/Track.hpp +18 -30
  1038. package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
  1039. package/package.json +26 -12
  1040. package/src/AudioBrowser.ts +2 -1
  1041. package/src/CLAUDE.md +57 -0
  1042. package/src/docs-floors.test.ts +71 -0
  1043. package/src/features/battery.test.ts +79 -0
  1044. package/src/features/battery.ts +17 -13
  1045. package/src/features/browser-config.test.ts +21 -6
  1046. package/src/features/browser-config.ts +13 -9
  1047. package/src/features/browser.test.ts +1 -1
  1048. package/src/features/browser.ts +69 -20
  1049. package/src/features/carConnection.ts +3 -4
  1050. package/src/features/equalizer.ts +10 -6
  1051. package/src/features/errors.ts +37 -22
  1052. package/src/features/favorites.ts +29 -24
  1053. package/src/features/gate.ts +30 -9
  1054. package/src/features/hook-wiring.test.ts +302 -0
  1055. package/src/features/metadata.ts +83 -17
  1056. package/src/features/network.ts +6 -2
  1057. package/src/features/nowPlaying.ts +29 -15
  1058. package/src/features/output.ts +10 -5
  1059. package/src/features/playback/controls.ts +13 -6
  1060. package/src/features/playback/playWhenReady.ts +6 -5
  1061. package/src/features/playback/playing.ts +16 -3
  1062. package/src/features/playback/progress.test.ts +169 -0
  1063. package/src/features/playback/progress.ts +13 -6
  1064. package/src/features/playback/rate.ts +8 -1
  1065. package/src/features/playback/state.ts +10 -6
  1066. package/src/features/playback/trackPlaybackTime.test.ts +16 -6
  1067. package/src/features/playback/trackPlaybackTime.ts +9 -7
  1068. package/src/features/playback/volume.ts +6 -5
  1069. package/src/features/player/options.ts +83 -82
  1070. package/src/features/player/setup.test.ts +12 -3
  1071. package/src/features/player/setup.ts +123 -64
  1072. package/src/features/player/validateOptions.ts +21 -0
  1073. package/src/features/queue/activeTrack.ts +15 -5
  1074. package/src/features/queue/queue.ts +58 -23
  1075. package/src/features/queue/repeatMode.ts +2 -2
  1076. package/src/features/queue/shuffle.ts +1 -2
  1077. package/src/features/remoteControls.ts +70 -125
  1078. package/src/features/sleepTimer.test.ts +171 -0
  1079. package/src/features/sleepTimer.ts +25 -9
  1080. package/src/nitro-stub-drift.test.ts +277 -0
  1081. package/src/public-surface.test.ts +147 -0
  1082. package/src/specs/audio-browser.nitro.ts +15 -8
  1083. package/src/style-resolution.test.ts +210 -0
  1084. package/src/test-utils/reactNativeStub.ts +60 -0
  1085. package/src/types/browser-native.ts +7 -3
  1086. package/src/types/browser-nodes.ts +417 -151
  1087. package/src/types/browser.ts +248 -177
  1088. package/src/utils/LazyNativeEmitter.ts +25 -15
  1089. package/src/utils/NativeUpdatedValue.ts +30 -16
  1090. package/src/utils/getTrackIdentity.ts +22 -0
  1091. package/src/utils/useDebug.test.ts +182 -0
  1092. package/src/utils/useDebug.ts +16 -3
  1093. package/src/utils/useNativeUpdatedValue.test.ts +111 -0
  1094. package/src/utils/useNativeUpdatedValue.ts +13 -17
  1095. package/src/utils/useNativeValueRefreshedBy.test.ts +68 -0
  1096. package/src/utils/useNativeValueRefreshedBy.ts +45 -0
  1097. package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
  1098. package/src/web/NativeAudioBrowser.ts +247 -92
  1099. package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
  1100. package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
  1101. package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
  1102. package/src/web/TrackPlayer/Player.dispatch.test.ts +50 -5
  1103. package/src/web/TrackPlayer/Player.load.test.ts +137 -1
  1104. package/src/web/TrackPlayer/Player.ts +286 -38
  1105. package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
  1106. package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
  1107. package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
  1108. package/src/web/TrackPlayer/QueueManager.ts +14 -0
  1109. package/src/web/TrackPlayer/QueuePlayer.ts +34 -16
  1110. package/src/web/__tests__/lifecycle.test.ts +345 -0
  1111. package/src/web/__tests__/lifecycleHarness.ts +351 -0
  1112. package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
  1113. package/src/web/__tests__/loadSupersession.test.ts +175 -0
  1114. package/src/web/__tests__/retry.test.ts +169 -0
  1115. package/src/web/browser/BrowserManager.ts +209 -111
  1116. package/src/web/browser/FavoriteManager.test.ts +84 -0
  1117. package/src/web/browser/FavoriteManager.ts +28 -23
  1118. package/src/web/browser/NavigationErrorManager.ts +3 -1
  1119. package/src/web/browser/SearchManager.test.ts +75 -0
  1120. package/src/web/browser/SearchManager.ts +25 -28
  1121. package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
  1122. package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
  1123. package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
  1124. package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
  1125. package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
  1126. package/src/web/browser/assertBrowsePageShape.ts +5 -3
  1127. package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
  1128. package/src/web/browser/classifyTrackNavigation.ts +9 -9
  1129. package/src/web/browser/parseSearchResponse.test.ts +8 -2
  1130. package/src/web/browser/parseSearchResponse.ts +3 -4
  1131. package/src/web/browser/sections.test.ts +91 -0
  1132. package/src/web/browser/sections.ts +72 -0
  1133. package/src/web/http/RequestConfigBuilder.test.ts +241 -1
  1134. package/src/web/http/RequestConfigBuilder.ts +140 -33
  1135. package/src/web/http/followMediaRedirect.test.ts +289 -0
  1136. package/src/web/http/followMediaRedirect.ts +253 -0
  1137. package/src/web/player/NowPlayingManager.ts +4 -3
  1138. package/src/web/util/BrowserPathHelper.test.ts +68 -0
  1139. package/src/web/util/BrowserPathHelper.ts +68 -13
  1140. package/website/guide/android-auto.md +126 -0
  1141. package/website/guide/android-certificates.md +488 -0
  1142. package/website/guide/artwork.md +300 -0
  1143. package/website/guide/audio-output.md +357 -0
  1144. package/website/guide/automotive.md +91 -0
  1145. package/website/guide/basic-usage.md +154 -0
  1146. package/website/guide/battery.md +142 -0
  1147. package/website/guide/browser.md +674 -0
  1148. package/website/guide/carplay.md +733 -0
  1149. package/website/guide/configuration.md +215 -0
  1150. package/website/guide/equalizer.md +235 -0
  1151. package/website/guide/errors.md +355 -0
  1152. package/website/guide/favorites.md +164 -0
  1153. package/website/guide/gate.md +157 -0
  1154. package/website/guide/getting-started.md +99 -0
  1155. package/website/guide/hooks.md +247 -0
  1156. package/website/guide/live-streams.md +156 -0
  1157. package/website/guide/metadata.md +289 -0
  1158. package/website/guide/migrating-from-track-player.md +289 -0
  1159. package/website/guide/native-callback-fetch.md +137 -0
  1160. package/website/guide/network.md +102 -0
  1161. package/website/guide/now-playing.md +203 -0
  1162. package/website/guide/playback.md +405 -0
  1163. package/website/guide/queue.md +334 -0
  1164. package/website/guide/remote-controls.md +314 -0
  1165. package/website/guide/search.md +270 -0
  1166. package/website/guide/sleep-timer.md +289 -0
  1167. package/website/guide/track.md +271 -0
  1168. package/ios/Bridge.h +0 -8
  1169. package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
  1170. package/ios/Browser/MediaResolveComposer.swift +0 -114
  1171. package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
  1172. package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
  1173. package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
  1174. package/ios/CarPlay/RNABMediaIntentHandler.swift +0 -70
  1175. package/ios/Model/MediaURL.swift +0 -67
  1176. package/ios/Model/SourceType.swift +0 -6
  1177. package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
  1178. package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
  1179. package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
  1180. package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
  1181. package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
  1182. package/ios/Observer/PlayerStateObserver.swift +0 -50
  1183. package/ios/Observer/PlayerTimeObserver.swift +0 -55
  1184. package/ios/Option/PitchAlgorithms.swift +0 -17
  1185. package/ios/Option/TimeEventFrequency.swift +0 -18
  1186. package/ios/Player/LoadSeekCoordinator.swift +0 -99
  1187. package/ios/Player/MediaIntentCriteria.swift +0 -139
  1188. package/ios/Player/MediaLoaderDelegate.swift +0 -11
  1189. package/ios/Player/PlaybackCoordinator.swift +0 -754
  1190. package/ios/Player/PlaybackEffectHandler.swift +0 -54
  1191. package/ios/Player/PlaybackErrorHandler.swift +0 -175
  1192. package/ios/Player/PlaybackStateStore.swift +0 -27
  1193. package/ios/Player/PlayingStateManager.swift +0 -33
  1194. package/ios/Player/RetryManager.swift +0 -322
  1195. package/ios/Player/SeekCompletionHandler.swift +0 -3
  1196. package/ios/Player/SleepTimerHandling.swift +0 -15
  1197. package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
  1198. package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -325
  1199. package/ios/Tests/MediaResolveTests.swift +0 -126
  1200. package/ios/Tests/OnceValueTests.swift +0 -79
  1201. package/ios/Tests/PlaybackCoordinatorTests.swift +0 -1260
  1202. package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
  1203. package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
  1204. package/ios/Tests/PlayingStateManagerTests.swift +0 -57
  1205. package/ios/Tests/RetryManagerTests.swift +0 -89
  1206. package/ios/TrackPlayer.swift +0 -1014
  1207. package/ios/TrackPlayerCallbacks.swift +0 -86
  1208. package/ios/Util/MetadataAdapter.swift +0 -131
  1209. package/ios/Util/OnceValue.swift +0 -104
  1210. package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
  1211. package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
  1212. package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
  1213. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
  1214. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
  1215. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
  1216. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
  1217. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
  1218. package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
  1219. package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
  1220. package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
  1221. package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
  1222. package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
  1223. package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
@@ -1,17 +1,17 @@
1
1
  package com.audiobrowser.browser
2
2
 
3
- import com.audiobrowser.util.artworkOf
4
-
5
3
  import android.util.LruCache
4
+ import androidx.media3.common.C
6
5
  import androidx.media3.common.MediaItem
7
6
  import androidx.media3.session.MediaSession
7
+ import com.audiobrowser.extension.identity
8
8
  import com.audiobrowser.http.HttpClient
9
9
  import com.audiobrowser.http.RequestConfigBuilder
10
10
  import com.audiobrowser.util.BrowserPathHelper
11
11
  import com.audiobrowser.util.TrackFactory
12
+ import com.audiobrowser.util.artworkOf
12
13
  import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
13
14
  import com.margelo.nitro.audiobrowser.BrowserSourceCallbackParam
14
- import com.margelo.nitro.audiobrowser.FavoritesMatchMode
15
15
  import com.margelo.nitro.audiobrowser.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____
16
16
  import com.margelo.nitro.audiobrowser.ImageContext
17
17
  import com.margelo.nitro.audiobrowser.MediaReference
@@ -20,8 +20,11 @@ import com.margelo.nitro.audiobrowser.NativeRouteEntry
20
20
  import com.margelo.nitro.audiobrowser.RequestConfig
21
21
  import com.margelo.nitro.audiobrowser.ResolvedTrack
22
22
  import com.margelo.nitro.audiobrowser.SearchParams
23
+ import com.margelo.nitro.audiobrowser.Section
24
+ import com.margelo.nitro.audiobrowser.StyleDisplay
23
25
  import com.margelo.nitro.audiobrowser.Track
24
26
  import com.margelo.nitro.audiobrowser.TransformableRequestConfig
27
+ import com.margelo.nitro.core.Promise
25
28
  import kotlinx.coroutines.Dispatchers
26
29
  import kotlinx.coroutines.async
27
30
  import kotlinx.coroutines.awaitAll
@@ -30,15 +33,6 @@ import kotlinx.coroutines.withContext
30
33
  import kotlinx.serialization.json.Json
31
34
  import timber.log.Timber
32
35
 
33
- /**
34
- * Core browser manager that handles navigation, search, and media browsing.
35
- *
36
- * This class contains the main business logic for:
37
- * - Route resolution and path matching with parameter extraction
38
- * - HTTP API requests and response processing
39
- * - JavaScript callback invocation
40
- * - Fallback handling and error management
41
- */
42
36
  class BrowserManager {
43
37
  private val router = SimpleRouter()
44
38
  private val httpClient = HttpClient()
@@ -75,7 +69,6 @@ class BrowserManager {
75
69
  set(value) {
76
70
  val previous = field
77
71
  field = value
78
- // Arrays need contentEquals for comparison
79
72
  if (value != null && !value.contentEquals(previous)) {
80
73
  onTabsChanged?.invoke(value)
81
74
  } else if (value == null && previous != null) {
@@ -83,55 +76,56 @@ class BrowserManager {
83
76
  }
84
77
  }
85
78
 
86
- // LRU cache for individual tracks - keyed by both url and src for O(1) lookup
79
+ // Keyed by id, path and src (see cacheTrack), so one track takes up to three entries.
87
80
  private val trackCache = LruCache<String, Track>(3000)
88
81
 
89
- // LRU cache for resolved content - keyed by path
90
- // Keeps recently visited paths cached for fast back navigation and tab switching
91
- // Invalidated via invalidateContentCache() when content changes
92
82
  private val contentCache = LruCache<String, ResolvedTrack>(20)
93
83
 
94
- // Cache for the most recent search - the query string and its results stored as one pair, so a
95
- // concurrent reader never sees one query matched with another query's results.
84
+ // Moves on clearContentCache, so a fetch that outlives one caches nothing; [pageGenerations]
85
+ // does the same for one path, and is cleared only together with a move of this. Separate from
86
+ // layerGeneration, which also moves on every path change. Car browses run on IO threads and
87
+ // the clear on the JS thread: each check and its write hold [cacheLock].
88
+ @Volatile private var contentGeneration = 0
89
+ private val pageGenerations = HashMap<String, Int>()
90
+ private var tabsGeneration = -1
91
+ private val cacheLock = Any()
92
+
93
+ // Query and results stored as one pair, so a concurrent reader never matches one query with
94
+ // another query's results.
96
95
  @Volatile private var lastSearch: Pair<String, Array<Track>>? = null
97
96
 
98
- // Set of favorited track identifiers (src)
97
+ // Track identities: id when non-blank, else src (ADR 0008).
99
98
  private var favoriteIds = setOf<String>()
100
99
 
101
- // Favorite match mode, propagated from the player's `favorite` capability.
102
- // null = favoriting disabled (no row hearts). Set via setFavoriteMatch.
103
- private var favoriteMatch: FavoritesMatchMode? = null
100
+ private var favoriteEnabled: Boolean = false
104
101
 
105
- // Navigation tracking to prevent race conditions
106
102
  @Volatile private var currentNavigationId = 0
107
103
 
108
104
  /**
109
- * Browser configuration containing routes, search, tabs, and request settings. This can be
110
- * updated dynamically when the configuration changes.
111
- *
112
- * Setting a new config bumps [layerGeneration] so the cached request/browse resolver layers are
113
- * re-resolved on the next request (the resolvers may close over config-derived state).
105
+ * Setting a new config re-resolves the request/browse resolver layers and the "view more" title
106
+ * on the next request, and clears the artwork registries: their registrations pin the previous
107
+ * config's JS callback handles.
114
108
  */
115
109
  var config: BrowserConfig = BrowserConfig()
116
110
  set(value) {
117
111
  field = value
118
112
  layerGeneration += 1
119
- // Registered artwork resolutions pin configs (and their JS callback handles)
120
- // from the previous configuration — never resolve through them again.
121
113
  artworkResolutions.clear()
122
114
  onArtworkRegistriesCleared?.invoke()
123
115
  }
124
116
 
125
- // Resolver-layer caching. The request/browse layers may be resolver thunks
126
- // (config.requestResolver / config.browseResolver) resolved once per *content generation*:
127
- // re-resolved when content is invalidated (clearContentCache, from invalidateAllContent) or when
128
- // a new config is set, cached, and merged per request.
117
+ // Request/browse resolver layers, resolved once per generation and merged per request. The
118
+ // generation moves on a new config or clearContentCache (invalidateAllContent).
129
119
  private var layerGeneration = 0
130
120
  private var resolvedLayerGeneration = -1
131
121
  private var resolvedRequestLayer: TransformableRequestConfig? = null
132
122
  private var resolvedBrowseLayer: TransformableRequestConfig? = null
133
123
 
134
- /** Test-only accessors for the resolver-layer cache state (see ensureLayersResolved). */
124
+ // Cached on the same generation, but resolved lazily: only a browse that appends a "view more"
125
+ // row asks for it.
126
+ private var resolvedViewMoreTitleGeneration = -1
127
+ private var resolvedViewMoreTitle = DEFAULT_VIEW_MORE_TITLE
128
+
135
129
  internal val layerGenerationForTest: Int
136
130
  get() = layerGeneration
137
131
 
@@ -145,112 +139,111 @@ class BrowserManager {
145
139
  get() = resolvedBrowseLayer
146
140
 
147
141
  /**
148
- * Maps produced artwork URIs back to (Track, artwork-config kind) so display-time bitmap loading
149
- * can re-resolve Track-first. See [ArtworkResolutionRegistry].
142
+ * Maps produced artwork URIs back to the track and config that made them, so display-time loading
143
+ * (which gets only a URI from Media3) can re-resolve with a size. See
144
+ * [ArtworkResolutionRegistry].
150
145
  */
151
146
  val artworkResolutions = ArtworkResolutionRegistry()
152
147
 
153
- /**
154
- * Sets the favorited track identifiers. Tracks will have their favorited field hydrated based on
155
- * this list during browsing.
156
- */
148
+ /** Sets the favorited track identities (id when non-blank, else src). */
157
149
  fun setFavorites(favorites: List<String>) {
158
150
  favoriteIds = favorites.toSet()
159
151
  Timber.d("Set ${favoriteIds.size} favorite IDs")
160
152
  }
161
153
 
162
- /**
163
- * Sets the favorite match mode (propagated from the `favorite` capability). null disables
164
- * row-heart hydration.
165
- */
166
- fun setFavoriteMatch(match: FavoritesMatchMode?) {
167
- favoriteMatch = match
154
+ fun setFavoriteEnabled(enabled: Boolean) {
155
+ favoriteEnabled = enabled
168
156
  }
169
157
 
170
- /**
171
- * Updates the favorite state for a single track identifier. Called when the heart button is
172
- * tapped in media controllers.
173
- */
174
- fun updateFavorite(id: String, favorited: Boolean) {
158
+ fun updateFavorite(identity: String, favorited: Boolean) {
175
159
  favoriteIds =
176
160
  if (favorited) {
177
- favoriteIds + id
161
+ favoriteIds + identity
178
162
  } else {
179
- favoriteIds - id
163
+ favoriteIds - identity
180
164
  }
181
- Timber.d("Updated favorite for '$id' to $favorited (total: ${favoriteIds.size})")
165
+ Timber.d("Updated favorite for '$identity' to $favorited (total: ${favoriteIds.size})")
182
166
  }
183
167
 
184
168
  /**
185
- * Hydrates the favorited field on a track based on the favoriteIds set. No-op unless favoriting
186
- * is enabled (the `favorite` capability). Only playable (src-bearing) tracks are favoritable; the
187
- * flag is set to true OR false so non-favorited tracks still show an (empty) heart. Doesn't
188
- * overwrite API-provided values.
169
+ * Sets `favorited` to true or false, so a track that isn't a favorite still shows an empty heart.
170
+ * A value the source already set wins; a track without an identity is left unset.
189
171
  */
190
172
  private fun hydrateFavorite(track: Track): Track {
191
- val match = favoriteMatch ?: return track
192
- // Don't overwrite API-provided favorites
173
+ if (!favoriteEnabled) return track
193
174
  if (track.favorited != null) return track
194
- // Only playable tracks are favoritable
195
- val src = track.src ?: return track
196
-
197
- val isFavorited = isFavorite(src, match)
175
+ if (track.identity == null) return track
198
176
 
199
- return track.copy(favorited = isFavorited)
177
+ return track.copy(favorited = isFavorite(track))
200
178
  }
201
179
 
202
- /** Whether [src] is favorited under the given match mode. */
203
- private fun isFavorite(src: String, match: FavoritesMatchMode): Boolean =
204
- when (match) {
205
- FavoritesMatchMode.EXACT -> favoriteIds.contains(src)
206
- FavoritesMatchMode.PARTIAL -> favoriteIds.any { BrowserPathHelper.containsSegment(src, it) }
207
- }
180
+ private fun isFavorite(track: Track): Boolean =
181
+ track.identity?.let { favoriteIds.contains(it) } == true
208
182
 
209
- /** Hydrates favorites on all children of a ResolvedTrack. */
183
+ // Pages arrive normalized (ADR 0010): `sections` is the only structure to walk.
210
184
  private fun hydrateChildren(resolvedTrack: ResolvedTrack): ResolvedTrack {
211
- val children = resolvedTrack.children ?: return resolvedTrack
212
- val hydratedChildren = children.map { hydrateFavorite(it) }.toTypedArray()
213
- return resolvedTrack.copy(children = hydratedChildren)
185
+ val sections = resolvedTrack.sections ?: return resolvedTrack
186
+ return resolvedTrack.copy(
187
+ sections =
188
+ sections
189
+ .map { section ->
190
+ section.copy(children = section.children.map { hydrateFavorite(it) }.toTypedArray())
191
+ }
192
+ .toTypedArray()
193
+ )
214
194
  }
215
195
 
216
- /** Cache a track by id, url, and src for O(1) lookup from any mediaId form. */
217
196
  private fun cacheTrack(track: Track) {
218
197
  track.id?.takeUnless { it.isBlank() }?.let { trackCache.put(it, track) }
219
- track.url?.let { trackCache.put(it, track) }
198
+ track.path?.let { trackCache.put(it, track) }
220
199
  track.src?.let { trackCache.put(it, track) }
221
200
  }
222
201
 
223
202
  private fun cacheChildren(resolvedTrack: ResolvedTrack) {
224
- resolvedTrack.children?.forEach { track ->
225
- cacheTrack(track)
226
- // Image-row items are playable surfaces of their own: cache them (with
227
- // their stamped contextual urls) so an id-keyed mediaId from an
228
- // expanded Android Auto tile can find its way back to queue expansion.
229
- track.imageRow?.forEach { item ->
230
- cacheTrack(with(TrackFactory) { item.toTrack(groupTitle = track.title) })
231
- }
203
+ resolvedTrack.flattenedChildren?.forEach { cacheTrack(it) }
204
+ }
205
+
206
+ // Warns once per page: the check runs again on every onGetChildren serve. Concurrent: those
207
+ // serves run several at once on the IO pool.
208
+ private val promiseWarnedPaths = java.util.concurrent.ConcurrentHashMap.newKeySet<String>()
209
+
210
+ /**
211
+ * Dev diagnostic (ADR 0011): an all-grid page under a browsable handle that declares no
212
+ * `style.display` renders as a list on Android Auto, which takes the layout from the parent-level
213
+ * hint, emitted only when the handle declares it. A handle missing from the cache (cold start
214
+ * straight into the page) skips the check. A mixed page never warns: the parent hint lays out the
215
+ * whole page, so grid would tile its list sections too.
216
+ */
217
+ fun warnIfGridPageLacksPromise(path: String, sections: List<Section>) {
218
+ if (sections.isEmpty() || !sections.all { it.style?.display == StyleDisplay.GRID }) return
219
+ val handle = trackCache.get(path) ?: return
220
+ if (handle.src != null) return // rendered playable: opens no page
221
+ if (handle.style?.display == null && promiseWarnedPaths.add(path)) {
222
+ Timber.w(
223
+ "Page '%s' serves grid sections, but its browsable handle declares no style.display — " +
224
+ "Android Auto's parent-level hint was not emitted, so this page renders as a list " +
225
+ "there. Declare `style: { display: 'grid' }` on the handle track.",
226
+ path,
227
+ )
232
228
  }
233
229
  }
234
230
 
235
231
  /**
236
- * Get a cached Track by mediaId (stable id, url, or src), or null if not cached. Used by Media3
237
- * to rehydrate MediaItem shells with full track metadata. Re-hydrates favorites in case
238
- * setFavoriteStates was called after caching.
232
+ * Returns the cached track for a mediaId (id, path or src, or a contextual path's trackId), with
233
+ * favorites re-hydrated, or null when it isn't cached.
239
234
  */
240
235
  fun getCachedTrack(mediaId: String): Track? {
241
- // Try direct lookup first (matches url or src)
242
236
  trackCache.get(mediaId)?.let { track ->
243
237
  val hydratedTrack = hydrateFavorite(track)
244
238
  Timber.d("Cache HIT for mediaId='$mediaId' → '${track.title}'")
245
239
  return hydratedTrack
246
240
  }
247
241
 
248
- // Try extracting src from contextual URL
249
242
  val trackId = BrowserPathHelper.extractTrackId(mediaId)
250
243
  if (trackId != null) {
251
244
  trackCache.get(trackId)?.let { track ->
252
245
  val hydratedTrack = hydrateFavorite(track)
253
- Timber.d("Cache HIT (extracted src) for mediaId='$mediaId' → '${track.title}'")
246
+ Timber.d("Cache HIT (extracted identity) for mediaId='$mediaId' → '${track.title}'")
254
247
  return hydratedTrack
255
248
  }
256
249
  }
@@ -260,28 +253,22 @@ class BrowserManager {
260
253
  }
261
254
 
262
255
  /**
263
- * Resolves a tapped mediaId to the contextual url to expand a queue from, or null when there is
264
- * none. A contextual mediaId is its own; a stable-id mediaId (see TrackFactory.buildMediaItem)
265
- * resolves through the track cache to the contextual url of the container it was most recently
266
- * browsed in — a legacy car controller round-trips only the mediaId, so the cache is what
267
- * remembers which list the row came from.
256
+ * The contextual path to expand a queue from, or null. A stable-id mediaId resolves through the
257
+ * track cache to the container it was most recently browsed in: a legacy car controller
258
+ * round-trips only the mediaId, so the cache is what remembers which list the row came from.
268
259
  */
269
- fun contextualUrlFor(mediaId: String): String? {
260
+ fun contextualPathFor(mediaId: String): String? {
270
261
  if (BrowserPathHelper.isContextual(mediaId)) return mediaId
271
- return getCachedTrack(mediaId)?.url?.takeIf { BrowserPathHelper.isContextual(it) }
262
+ return getCachedTrack(mediaId)?.path?.takeIf { BrowserPathHelper.isContextual(it) }
272
263
  }
273
264
 
274
265
  /**
275
- * Resolves a single Media3 MediaItem to a Track. Prefers the track cache (keyed by id, url, and
276
- * src).
266
+ * A cache miss is reachable: a controller can replay a mediaId this process never browsed (a
267
+ * search result after process death). When the mediaId is a playable URL, or the item's
268
+ * requestMetadata carries the playable uri (stamped by TrackFactory), it builds a minimal track
269
+ * from the item's metadata.
277
270
  *
278
- * A cache miss is legitimately reachable: a controller can replay a mediaId this process never
279
- * browsed — e.g. a search-result track after process death. When the mediaId is a playable URL,
280
- * or the item's requestMetadata carries the playable uri (stamped by TrackFactory for stable-id
281
- * mediaIds, and round-tripped by Media3 controllers), fall back to a minimal track built from the
282
- * item's own metadata instead of failing playback.
283
- *
284
- * @throws IllegalStateException if the mediaId is not cached and no playable URL is available
271
+ * @throws IllegalStateException when the mediaId is not cached and no playable URL is available
285
272
  */
286
273
  private fun resolveMediaItemToTrack(mediaItem: MediaItem): Track {
287
274
  val mediaId = mediaItem.mediaId
@@ -302,29 +289,27 @@ class BrowserManager {
302
289
  val metadata = mediaItem.mediaMetadata
303
290
  return hydrateFavorite(
304
291
  Track(
305
- // A mediaId distinct from the playable uri is the track's stable id —
306
- // keep it so the item's identity (car now-playing row match) survives.
292
+ // A mediaId distinct from the playable uri is the stable id; keeping it lets the car's
293
+ // now-playing row match.
307
294
  id = mediaId.takeIf { it != fallbackSrc },
308
- url = null,
295
+ path = null,
309
296
  src = fallbackSrc,
310
297
  artwork = artworkOf(metadata.artworkUri?.toString()),
311
298
  artworkSource = null,
312
299
  request = null,
313
- artworkCarPlayTinted = null,
314
300
  title = metadata.title?.toString() ?: mediaId,
315
301
  subtitle = metadata.artist?.toString(),
316
302
  artist = null,
317
- albumUrl = null,
303
+ albumPath = null,
318
304
  album = metadata.albumTitle?.toString(),
319
305
  description = metadata.description?.toString(),
320
306
  genre = metadata.genre?.toString(),
321
307
  duration = null,
322
308
  style = null,
323
- childrenStyle = null,
309
+ disabled = null,
324
310
  favorited = null,
325
- groupTitle = null,
326
311
  live = null,
327
- imageRow = null,
312
+ icyCharset = null,
328
313
  )
329
314
  )
330
315
  }
@@ -333,46 +318,35 @@ class BrowserManager {
333
318
  }
334
319
 
335
320
  /**
336
- * **Media3/Android Auto Integration Entry Point**
337
- *
338
- * Resolves Media3 MediaItems for playback, with special handling for Android Auto queue
339
- * expansion. Called exclusively from `MediaSessionCallback.onSetMediaItems()`.
321
+ * Resolves the items `MediaSessionCallback.onSetMediaItems()` receives. A single item with a
322
+ * search query plays the search results from that item; a single contextual item expands to the
323
+ * tapped section's queue. Otherwise each item resolves through the track cache. Disabled tracks
324
+ * are dropped and the start index shifts to match.
340
325
  *
341
- * Behavior:
342
- * - Single item: Attempts queue expansion (Android Auto album/playlist restoration)
343
- * - Multiple items OR expansion fails: Falls back to cache resolution
344
- *
345
- * @param mediaItems List of Media3 MediaItems requested for playback
346
- * @param startIndex Index of the item to start playing
347
- * @param startPositionMs Position within the start item to begin playback
348
- * @return MediaSession.MediaItemsWithStartPosition ready for Media3
349
- * @throws IllegalStateException if a mediaId is neither cached nor a playable URL
326
+ * @throws IllegalStateException when the start track is disabled, every track is disabled, or a
327
+ * mediaId is neither cached nor a playable URL
350
328
  */
351
329
  suspend fun resolveMediaItemsForPlayback(
352
330
  mediaItems: List<MediaItem>,
353
331
  startIndex: Int,
354
332
  startPositionMs: Long,
355
333
  ): MediaSession.MediaItemsWithStartPosition {
356
- // Android Auto queue expansion: single track → full album/playlist
357
334
  if (mediaItems.size == 1) {
358
335
  val mediaItem = mediaItems[0]
359
336
 
360
- // Handle search query - user initiated playback from search results
361
337
  val searchQuery = mediaItem.requestMetadata.searchQuery
362
338
  if (searchQuery != null) {
363
339
  Timber.d("Handling search playback request for query: $searchQuery")
364
340
 
365
- // Execute search (will hit cache if already performed)
366
341
  val searchResults = search(searchQuery)
367
- val searchTracks = searchResults.children
342
+ val searchTracks =
343
+ searchResults.flattenedChildren?.filterNot { it.disabled == true }?.toTypedArray()
368
344
 
369
345
  if (searchTracks != null && searchTracks.isNotEmpty()) {
370
- // Find the selected track in search results (mediaId is the stable id
371
- // when the track has one, else url/src — see TrackFactory)
372
346
  val mediaId = mediaItem.mediaId
373
347
  val selectedIndex =
374
348
  searchTracks.indexOfFirst { track ->
375
- track.id == mediaId || track.url == mediaId || track.src == mediaId
349
+ track.id == mediaId || track.path == mediaId || track.src == mediaId
376
350
  }
377
351
 
378
352
  if (selectedIndex >= 0) {
@@ -380,7 +354,6 @@ class BrowserManager {
380
354
  "Playing search result at index $selectedIndex of ${searchTracks.size} results"
381
355
  )
382
356
 
383
- // Convert to Media3 MediaItems
384
357
  val searchMediaItems = searchTracks.map { track -> TrackFactory.toMedia3(track) }
385
358
 
386
359
  return MediaSession.MediaItemsWithStartPosition(
@@ -396,20 +369,19 @@ class BrowserManager {
396
369
  }
397
370
  }
398
371
 
372
+ // A failed search match falls through to plain resolution, never to browse expansion: the
373
+ // user asked for that one result, not a browsed list.
399
374
  val mediaId = mediaItems[0].mediaId
400
- // A failed search match falls through to plain resolution, never to browse
401
- // expansion — the user asked for that one result, not a browsed list.
402
- val contextualUrl = if (searchQuery == null) contextualUrlFor(mediaId) else null
375
+ val contextualPath = if (searchQuery == null) contextualPathFor(mediaId) else null
403
376
 
404
- if (contextualUrl != null) {
405
- Timber.d("Attempting queue expansion for mediaId='$mediaId' via '$contextualUrl'")
377
+ if (contextualPath != null) {
378
+ Timber.d("Attempting queue expansion for mediaId='$mediaId' via '$contextualPath'")
406
379
 
407
- val expanded = expandQueueFromContextualUrl(contextualUrl)
380
+ val expanded = expandQueueFromContextualPath(contextualPath)
408
381
 
409
382
  if (expanded != null) {
410
383
  val (tracks, selectedIndex) = expanded
411
384
 
412
- // Convert to Media3 MediaItems
413
385
  val expandedMediaItems = tracks.map { track -> TrackFactory.toMedia3(track) }
414
386
 
415
387
  return MediaSession.MediaItemsWithStartPosition(
@@ -421,95 +393,116 @@ class BrowserManager {
421
393
  }
422
394
  }
423
395
 
424
- // No expansion - resolve from cache (with a minimal-track fallback for replayed mediaIds)
425
396
  val resolvedTracks = mediaItems.map { resolveMediaItemToTrack(it) }
426
397
 
427
- // Convert to Media3 MediaItems
428
- val resolvedMediaItems = resolvedTracks.map { track -> TrackFactory.toMedia3(track) }
398
+ // Refusal fails the future: Media3 surfaces an error to the controller and current playback
399
+ // stays untouched, where an empty item list would clear the timeline. Android Auto and
400
+ // Assistant request playback through Media3's legacy path, which passes C.INDEX_UNSET for
401
+ // "the first item": normalize before the guard, or the refusal misses the cars.
402
+ val effectiveStartIndex = if (startIndex == C.INDEX_UNSET) 0 else startIndex
403
+ val startTrack = resolvedTracks.getOrNull(effectiveStartIndex)
404
+ if (startTrack != null && startTrack.disabled == true) {
405
+ Timber.w("Refusing playback of disabled track: ${startTrack.title}")
406
+ throw IllegalStateException("Refusing playback of disabled track: ${startTrack.title}")
407
+ }
408
+ val playableTracks = resolvedTracks.filterNot { it.disabled == true }
409
+ if (playableTracks.isEmpty()) {
410
+ Timber.w("Refusing playback: every requested track is disabled")
411
+ throw IllegalStateException("Refusing playback: every requested track is disabled")
412
+ }
413
+ // Positional, not indexOf: value equality would map a duplicated track to its first copy.
414
+ val adjustedStartIndex =
415
+ when {
416
+ startIndex == C.INDEX_UNSET -> C.INDEX_UNSET
417
+ startTrack == null -> 0
418
+ else -> resolvedTracks.take(effectiveStartIndex).count { it.disabled != true }
419
+ }
420
+
421
+ val resolvedMediaItems = playableTracks.map { track -> TrackFactory.toMedia3(track) }
429
422
 
430
- return MediaSession.MediaItemsWithStartPosition(resolvedMediaItems, startIndex, startPositionMs)
423
+ return MediaSession.MediaItemsWithStartPosition(
424
+ resolvedMediaItems,
425
+ adjustedStartIndex,
426
+ startPositionMs,
427
+ )
431
428
  }
432
429
 
433
- /**
434
- * Validates that a track has either url or src for stable identification. Throws
435
- * IllegalStateException if validation fails.
436
- */
437
430
  private fun validateTrack(track: Track, context: String) {
438
- if (track.url == null && track.src == null) {
431
+ if (track.path == null && track.src == null) {
439
432
  throw IllegalStateException(
440
- "$context must have either 'url' or 'src' property for stable identification. Track: ${track.title}"
433
+ "$context must have either 'path' or 'src' property for stable identification. Track: ${track.title}"
441
434
  )
442
435
  }
443
436
  }
444
437
 
438
+ /** Resolves the page at [path]; a contextual path resolves its parent container. */
445
439
  suspend fun resolve(path: String, useCache: Boolean = true): ResolvedTrack {
446
440
  Timber.d("=== RESOLVE: path='$path' (useCache=$useCache) ===")
447
441
 
448
- // Strip __trackId from contextual URLs (e.g., "/library/radio?__trackId=song.mp3" →
449
- // "/library/radio")
450
- // This allows resolving the parent container for tracks referenced by contextual URL
451
442
  val normalizedPath = BrowserPathHelper.stripTrackId(path)
452
443
  if (normalizedPath != path) {
453
- Timber.d("Stripped __trackId from contextual URL: '$normalizedPath'")
444
+ Timber.d("Stripped __trackId from contextual path: '$normalizedPath'")
454
445
  }
455
446
 
456
- // Check content cache first
457
447
  if (useCache) {
458
448
  contentCache.get(normalizedPath)?.let { cached ->
459
449
  Timber.d("Content cache HIT for path='$normalizedPath'")
460
- // Re-key the track cache even on a hit: an id-keyed lookup (stable-id
461
- // mediaId → contextual url, see contextualUrlFor) must reflect the
462
- // most recently *browsed* container, which a cached re-display
463
- // otherwise wouldn't re-register.
450
+ // Re-key the track cache on a hit too: contextualPathFor must see the most recently
451
+ // browsed container.
464
452
  cacheChildren(cached)
465
- // Re-hydrate favorites in case they changed since caching
466
453
  return hydrateChildren(cached)
467
454
  }
468
455
  Timber.d("Content cache MISS for path='$normalizedPath'")
469
456
  }
470
457
 
458
+ val generation = synchronized(cacheLock) { pageGeneration(normalizedPath) }
471
459
  val resolvedTrack = resolveUncached(normalizedPath)
472
460
 
473
- // Cache the resolved content for future navigation
474
- contentCache.put(normalizedPath, resolvedTrack)
461
+ synchronized(cacheLock) {
462
+ if (generation == pageGeneration(normalizedPath)) {
463
+ contentCache.put(normalizedPath, resolvedTrack)
464
+ }
465
+ }
475
466
 
476
- // Cache children for Media3 track lookups (getCachedTrack)
477
467
  cacheChildren(resolvedTrack)
478
468
 
479
469
  return hydrateChildren(resolvedTrack)
480
470
  }
481
471
 
482
- /**
483
- * Invalidates the content cache for a specific path. Called when content at that path has changed
484
- * (e.g., via notifyContentChanged).
485
- *
486
- * @param path The container path to invalidate (e.g., "/library/radio")
487
- * @throws IllegalArgumentException if passed a contextual URL (contains __trackId)
488
- */
472
+ /** @throws IllegalArgumentException when [path] is contextual rather than a container path */
489
473
  fun invalidateContentCache(path: String) {
490
474
  require(!BrowserPathHelper.isContextual(path)) {
491
- "invalidateContentCache() expects a container path, not a contextual URL: $path"
475
+ "invalidateContentCache() expects a container path, not a contextual path: $path"
476
+ }
477
+ synchronized(cacheLock) {
478
+ pageGenerations[path] = (pageGenerations[path] ?: 0) + 1
479
+ contentCache.remove(path)
492
480
  }
493
- contentCache.remove(path)
494
481
  Timber.d("Invalidated content cache for path='$path'")
495
482
  }
496
483
 
497
- /** Clears all cached content. */
484
+ private fun pageGeneration(path: String) = contentGeneration to pageGenerations[path]
485
+
486
+ /**
487
+ * Clears every cached page and the last search, which nothing else evicts, and re-resolves the
488
+ * tabs, resolver layers and "view more" title on the next request. A fetch in flight caches
489
+ * nothing.
490
+ */
498
491
  fun clearContentCache() {
499
- contentCache.evictAll()
500
- // Bump the layer generation so request/browse resolver thunks are re-resolved on the next
501
- // request (invalidateAllContent → clearContentCache is the documented re-resolve trigger).
492
+ synchronized(cacheLock) {
493
+ contentGeneration += 1
494
+ pageGenerations.clear()
495
+ contentCache.evictAll()
496
+ lastSearch = null
497
+ }
502
498
  layerGeneration += 1
503
- // Invalidated content's artwork resolutions go with it (same staleness rule as the
504
- // config setter).
505
499
  artworkResolutions.clear()
506
500
  onArtworkRegistriesCleared?.invoke()
507
501
  Timber.d("Cleared all content cache")
508
502
  }
509
503
 
510
504
  private suspend fun resolveUncached(path: String): ResolvedTrack {
511
- // Match an explicit route (or the '*' default). With no match, fall back to
512
- // the implicit default: fetch the path via the request + browse config.
505
+ // With no route matched, the implicit default fetches the path via the request + browse config.
513
506
  val match = config.routes?.let { findBestRouteMatch(path, it) }
514
507
 
515
508
  val resolvedTrack: ResolvedTrack
@@ -525,90 +518,61 @@ class BrowserManager {
525
518
  effectiveArtworkConfig = config.artwork
526
519
  }
527
520
 
528
- // Transform children: generate contextual URLs and transform artwork URLs
529
- val transformedChildren =
530
- resolvedTrack.children?.let { children ->
531
- coroutineScope {
532
- children
533
- .mapIndexed { index, track ->
521
+ val sections = resolvedTrack.normalizedSections ?: return resolvedTrack
522
+ // Before the sections are folded, while each level is still attributable.
523
+ InertStyleDiagnostic.warn(path, resolvedTrack.style, sections)
524
+ // The contextual index is the flat page position: children in section order (ADR 0009).
525
+ var flatIndex = 0
526
+ // One scope for the page: every child's artwork transform launches up front, so a slow section
527
+ // doesn't hold up the ones after it.
528
+ val transformedSections = coroutineScope {
529
+ sections
530
+ .map { section ->
531
+ val base = flatIndex
532
+ flatIndex += section.children.size
533
+ section to
534
+ section.children.mapIndexed { offset, track ->
534
535
  async {
535
- // Validate that track has stable identifier. A track carrying an
536
- // imageRow is exempt: a url-less row is a pure preview — never
537
- // selected, navigated to, or cached (its items carry their own
538
- // identity; on Android Auto it expands into them).
539
- if (track.imageRow.isNullOrEmpty()) validateTrack(track, "Child track")
536
+ val index = base + offset
537
+ validateTrack(track, "Child track")
540
538
 
541
539
  var transformedTrack = track
542
540
 
543
- // Generate contextual URLs for playable tracks
544
- // Always regenerate to reflect the current browsing context, not the original
545
- // context
546
- // (e.g., a track favorited from an album should use /favorites context when browsed
547
- // there)
548
- if (track.src != null) {
549
- val contextualUrl = BrowserPathHelper.build(path, track.src)
550
- transformedTrack = transformedTrack.copy(url = contextualUrl)
541
+ val trackIdentity = track.identity
542
+ // Regenerated on every browse so the path names the container it was browsed in;
543
+ // the flat position breaks ties between duplicate identities.
544
+ if (track.src != null && trackIdentity != null) {
545
+ val contextualPath = BrowserPathHelper.build(path, trackIdentity, index)
546
+ transformedTrack = transformedTrack.copy(path = contextualPath)
551
547
 
552
548
  Timber.d(
553
- "[$path] Child[$index] '${track.title}': Playable, contextualUrl=$contextualUrl (src=${track.src})"
549
+ "[$path] Child[$index] '${track.title}': Playable, contextualPath=$contextualPath (identity=$trackIdentity)"
554
550
  )
555
551
  } else {
556
552
  Timber.d(
557
- "[$path] Child[$index] '${track.title}': Browsable with url=${track.url}"
553
+ "[$path] Child[$index] '${track.title}': Browsable with path=${track.path}"
558
554
  )
559
555
  }
560
556
 
561
- // Playable image-row items get contextual URLs like any list
562
- // row, so a tile tap expands into its section's queue instead
563
- // of a queue of one (ADR 0006).
564
- transformedTrack.imageRow?.let { items ->
565
- transformedTrack =
566
- transformedTrack.copy(
567
- imageRow =
568
- items
569
- .map { item ->
570
- if (item.url == null && item.src != null) {
571
- item.copy(url = BrowserPathHelper.build(path, item.src))
572
- } else {
573
- item
574
- }
575
- }
576
- .toTypedArray()
577
- )
578
- }
579
-
580
- // Transform artwork URL. At browse-time there is no display size info.
581
- transformedTrack =
582
- transformArtworkUrl(
583
- transformedTrack,
584
- effectiveArtworkConfig,
585
- path,
586
- index,
587
- ImageContext(null, null),
588
- )
589
-
590
- transformedTrack
557
+ // No display size at browse time.
558
+ transformArtworkUrl(
559
+ transformedTrack,
560
+ effectiveArtworkConfig,
561
+ path,
562
+ index,
563
+ ImageContext(null, null),
564
+ )
591
565
  }
592
566
  }
593
- .awaitAll()
594
567
  }
595
- }
596
-
597
- // Return resolved track with transformed children
598
- return if (transformedChildren != null) {
599
- resolvedTrack.copy(children = transformedChildren.toTypedArray())
600
- } else {
601
- resolvedTrack
568
+ .map { (section, transformedChildren) ->
569
+ section.copy(children = transformedChildren.awaitAll().toTypedArray())
570
+ }
602
571
  }
572
+
573
+ return resolvedTrack.copy(sections = transformedSections.toTypedArray(), children = null)
603
574
  }
604
575
 
605
- /**
606
- * Transforms a track's artwork via [resolveArtworkUrl]. Populates artworkSource with the
607
- * transformed ImageSource, keeping artwork unchanged. Handles all edge cases: undefined returns,
608
- * errors, missing artwork.
609
- *
610
- * @param imageContext Optional size context for CDN URL generation (null at browse-time)
611
- */
612
576
  private suspend fun transformArtworkUrl(
613
577
  track: Track,
614
578
  artworkConfig: ArtworkRequestConfig?,
@@ -616,7 +580,6 @@ class BrowserManager {
616
580
  index: Int,
617
581
  imageContext: ImageContext? = null,
618
582
  ): Track {
619
- // No artwork config and no track.artwork - nothing to transform
620
583
  if (artworkConfig == null && track.artwork == null) {
621
584
  return track
622
585
  }
@@ -625,20 +588,16 @@ class BrowserManager {
625
588
  val imageSource = resolveArtworkUrl(track, artworkConfig, imageContext)
626
589
 
627
590
  when {
628
- // resolve returned null → no artwork source
629
591
  imageSource == null -> {
630
592
  Timber.d(
631
593
  "[$path] Child[$index] '${track.title}': Artwork resolver returned null, no artworkSource"
632
594
  )
633
595
  track.copy(artworkSource = null)
634
596
  }
635
- // resolve returned ImageSource → set artworkSource
636
597
  else -> {
637
598
  Timber.d("[$path] Child[$index] '${track.title}': artworkSource set: ${imageSource.uri}")
638
- // Remember how this URI was produced so display-time loading (which only
639
- // gets a URI from Media3) can re-resolve Track-first with a size hint.
640
- // Register the per-route config only when it isn't the global fallback,
641
- // so display-time resolution reads the *current* config.artwork.
599
+ // Registers a per-route config only, so display-time resolution reads the current
600
+ // config.artwork rather than a stale global.
642
601
  artworkResolutions.register(
643
602
  imageSource.uri,
644
603
  track,
@@ -648,7 +607,6 @@ class BrowserManager {
648
607
  }
649
608
  }
650
609
  } catch (e: Exception) {
651
- // resolve threw → log error, clear artworkSource to avoid broken images
652
610
  Timber.e(
653
611
  e,
654
612
  "[$path] Child[$index] '${track.title}': Artwork transform failed, clearing artworkSource",
@@ -658,109 +616,94 @@ class BrowserManager {
658
616
  }
659
617
 
660
618
  /**
661
- * Expands a contextual URL into a queue of playable tracks.
662
- *
663
- * Used when navigating to a track to load it with its full album/playlist context. Returns only
664
- * the selected track if singleTrack is true.
665
- *
666
- * @param contextualUrl The contextual URL (e.g., "/album?__trackId=song.mp3")
667
- * @return Pair of (tracks array, selected track index), or null if expansion fails
619
+ * Expands a contextual path into the playable, enabled tracks of the tapped section (ADR 0006)
620
+ * and the start index, or only the tapped track when `singleTrack` is set. Returns null when the
621
+ * path is not contextual, the tapped identity is no longer on the page or is disabled, or
622
+ * resolution fails; the caller then plays the stored single track.
668
623
  */
669
- suspend fun expandQueueFromContextualUrl(contextualUrl: String): Pair<Array<Track>, Int>? {
670
- val trackId = BrowserPathHelper.extractTrackId(contextualUrl) ?: return null
624
+ suspend fun expandQueueFromContextualPath(contextualPath: String): Pair<Array<Track>, Int>? {
625
+ val trackId = BrowserPathHelper.extractTrackId(contextualPath) ?: return null
671
626
 
672
- Timber.d("Expanding queue from contextual URL: $contextualUrl (trackId=$trackId)")
627
+ Timber.d("Expanding queue from contextual path: $contextualPath (trackId=$trackId)")
673
628
 
674
629
  try {
675
- // Resolve the parent container to get all siblings
676
- val parentPath = BrowserPathHelper.stripTrackId(contextualUrl)
630
+ val parentPath = BrowserPathHelper.stripTrackId(contextualPath)
677
631
  val parentResolvedTrack = resolve(parentPath)
678
- val children = parentResolvedTrack.children
632
+ val sections = parentResolvedTrack.normalizedSections
679
633
 
680
- if (children.isNullOrEmpty()) {
634
+ if (sections.isNullOrEmpty()) {
681
635
  Timber.w("Parent has no children, cannot expand queue")
682
636
  return null
683
637
  }
684
638
 
685
- // Queue scope is the tapped section, not the whole page (ADR 0006). An
686
- // id that no longer appears on the page aborts the expansion — the
687
- // caller falls back to the stored single track; silently queueing the
688
- // changed list would resume the wrong station.
689
- val sectionTracks =
690
- when (val section = SectionScope.section(children.toList(), trackId)) {
691
- is SectionScope.Section.ImageRow ->
692
- with(TrackFactory) { section.items.map { it.toTrack(groupTitle = null) } }
693
- is SectionScope.Section.Run -> section.tracks
694
- null -> return null
695
- }
639
+ // The stamped flat index pins which section and which copy was tapped; a stale index falls
640
+ // back to the first identity match. A vanished identity aborts: queueing the changed list
641
+ // would resume the wrong station.
642
+ val tappedIndex = BrowserPathHelper.extractIndex(contextualPath)
643
+ val scoped = SectionScope.scoped(sections, trackId, tappedIndex) ?: return null
644
+ val sectionTracks = scoped.section.children.toList()
645
+ val tappedOffset = scoped.tappedOffset
696
646
 
697
- // Filter to only playable tracks (tracks with src)
698
- val playableTracks = sectionTracks.filter { track -> track.src != null }
647
+ val playableTracks =
648
+ sectionTracks.filter { track -> track.src != null && track.disabled != true }
699
649
 
700
650
  if (playableTracks.isEmpty()) {
701
651
  Timber.w("Parent has no playable tracks, cannot expand queue")
702
652
  return null
703
653
  }
704
654
 
705
- // Find the index of the selected track in the playable tracks array
706
- val selectedIndex = playableTracks.indexOfFirst { track -> track.src == trackId }
655
+ val selectedIndex =
656
+ if (
657
+ tappedOffset != null &&
658
+ sectionTracks[tappedOffset].src != null &&
659
+ sectionTracks[tappedOffset].disabled != true
660
+ ) {
661
+ sectionTracks.take(tappedOffset + 1).count { it.src != null && it.disabled != true } - 1
662
+ } else {
663
+ playableTracks.indexOfFirst { track -> track.identity == trackId }
664
+ }
707
665
 
708
666
  if (selectedIndex < 0) {
709
- Timber.w("Track with src='$trackId' not found in playable children")
667
+ Timber.w("Track with identity='$trackId' not found in playable children")
710
668
  return null
711
669
  }
712
670
 
713
- // Check singleTrack setting - if true, return only the selected track
714
671
  if (config.singleTrack) {
715
672
  Timber.d("singleTrack=true - returning single track at index $selectedIndex")
716
673
  return Pair(arrayOf(playableTracks[selectedIndex]), 0)
717
674
  }
718
675
 
719
676
  Timber.d(
720
- "singleTrack=false - returning ${playableTracks.size} playable tracks (from ${children.size} total), starting at index $selectedIndex"
677
+ "singleTrack=false - returning ${playableTracks.size} playable tracks (from ${sectionTracks.size} in section), starting at index $selectedIndex"
721
678
  )
722
679
  return Pair(playableTracks.toTypedArray(), selectedIndex)
723
680
  } catch (e: Exception) {
724
- Timber.e(e, "Error expanding queue from contextual URL: $contextualUrl")
681
+ Timber.e(e, "Error expanding queue from contextual path: $contextualPath")
725
682
  return null
726
683
  }
727
684
  }
728
685
 
729
686
  /**
730
- * Navigate to a path and return browser content.
731
- *
732
- * Uses a navigation ID to prevent race conditions when multiple navigations overlap. Only the
733
- * most recent navigation's result is applied.
734
- *
735
- * @param path The path to navigate to (e.g., "/artists/123")
736
- * @return ResolvedTrack containing the navigation result
687
+ * Sets the path and clears the content at once, then resolves. Only the latest navigation or
688
+ * refresh publishes its content; an overtaken one still returns its result.
737
689
  */
738
690
  suspend fun navigate(path: String): ResolvedTrack {
739
691
  Timber.d("Navigating to path: $path")
740
692
 
741
- // Increment navigation ID and capture for this navigation
742
693
  val navigationId = ++currentNavigationId
743
694
 
744
695
  this.path = path
745
- this.content = null // Clear content immediately to show loading state
696
+ this.content = null
746
697
  val content = resolve(path)
747
698
 
748
- // Only apply result if this is still the current navigation
749
699
  if (navigationId == currentNavigationId) {
750
700
  this.content = content
751
701
  }
752
702
  return content
753
703
  }
754
704
 
755
- /**
756
- * Refresh the current path's content without changing navigation state. Used for background
757
- * refreshes (e.g., when content changes via notifyContentChanged). Bypasses content cache to
758
- * fetch fresh data. Errors are silently ignored.
759
- *
760
- * Uses navigation ID tracking to prevent race conditions.
761
- */
705
+ /** Re-resolves the current path, bypassing the cache. Errors are logged, never thrown. */
762
706
  suspend fun refresh() {
763
- // Increment navigation ID and capture for this refresh
764
707
  val navigationId = ++currentNavigationId
765
708
 
766
709
  val currentPath = path
@@ -770,7 +713,6 @@ class BrowserManager {
770
713
  contentCache.remove(currentPath)
771
714
  val content = resolve(currentPath, useCache = false)
772
715
 
773
- // Only apply result if this is still the current navigation
774
716
  if (navigationId == currentNavigationId) {
775
717
  this.content = content
776
718
  }
@@ -779,25 +721,13 @@ class BrowserManager {
779
721
  }
780
722
  }
781
723
 
782
- /**
783
- * Get cached search results for a query. Used by Media3 onGetSearchResult() callback to retrieve
784
- * previously executed search.
785
- *
786
- * @param query The search query string
787
- * @return Array of Track results, or null if not found
788
- */
724
+ /** Returns the results of the most recent search when [query] matches it, else null. */
789
725
  fun getCachedSearchResults(query: String): Array<Track>? {
790
726
  val (cachedQuery, cachedResults) = lastSearch ?: return null
791
727
  if (query != cachedQuery) return null
792
728
  return cachedResults.map { hydrateFavorite(it) }.toTypedArray()
793
729
  }
794
730
 
795
- /**
796
- * Search for tracks and return playable results.
797
- *
798
- * @param query The search query string
799
- * @return Array of playable tracks, or null if no results or search not configured
800
- */
801
731
  suspend fun searchPlayable(query: String): Array<Track>? {
802
732
  return searchPlayable(
803
733
  SearchParams(
@@ -814,16 +744,15 @@ class BrowserManager {
814
744
  }
815
745
 
816
746
  /**
817
- * Search for tracks and return playable results. If the first result is browsable, resolves it
818
- * and returns its children. If the first result is playable, returns it. Used for voice search
819
- * "play X" commands.
747
+ * Returns the playable results, or null when there are none. A browsable first result plays its
748
+ * children instead.
820
749
  *
821
- * @param params The structured search parameters
822
- * @return Array of playable tracks, or null if no results or search not configured
750
+ * @throws Exception when the search callback fails; a failed API search returns null
823
751
  */
824
752
  suspend fun searchPlayable(params: SearchParams): Array<Track>? {
825
753
  val searchResults = search(params)
826
- val tracks = searchResults.children
754
+ // Disabled tracks go before the first result is picked, so one can't capture the play.
755
+ val tracks = searchResults.flattenedChildren?.filter { it.disabled != true }?.toTypedArray()
827
756
 
828
757
  if (tracks.isNullOrEmpty()) {
829
758
  return null
@@ -831,15 +760,13 @@ class BrowserManager {
831
760
 
832
761
  val firstResult = tracks[0]
833
762
 
834
- // Check if result is browsable-only (container/route) vs playable
835
- // If it's browsable but also playable (has src or playable=true), treat it as playable
836
- val firstResultUrl = firstResult.url
763
+ val firstResultPath = firstResult.path
837
764
  val tracksToFilter =
838
- if (firstResult.src == null && firstResultUrl != null) {
839
- Timber.d("First search result is browsable-only, resolving: $firstResultUrl")
840
- val resolvedTrack = resolve(firstResultUrl)
841
- resolvedTrack.children
842
- ?.filter { it.src != null }
765
+ if (firstResult.src == null && firstResultPath != null) {
766
+ Timber.d("First search result is browsable-only, resolving: $firstResultPath")
767
+ val resolvedTrack = resolve(firstResultPath)
768
+ resolvedTrack.flattenedChildren
769
+ ?.filter { it.src != null && it.disabled != true }
843
770
  ?.takeIf { it.isNotEmpty() }
844
771
  ?.toTypedArray() ?: tracks
845
772
  } else {
@@ -849,12 +776,6 @@ class BrowserManager {
849
776
  return tracksToFilter.filter { it.src != null }.takeIf { it.isNotEmpty() }?.toTypedArray()
850
777
  }
851
778
 
852
- /**
853
- * Search for tracks using the configured search source.
854
- *
855
- * @param query The search query string
856
- * @return ResolvedTrack containing search results as children
857
- */
858
779
  suspend fun search(query: String): ResolvedTrack {
859
780
  return search(
860
781
  SearchParams(
@@ -871,47 +792,43 @@ class BrowserManager {
871
792
  }
872
793
 
873
794
  /**
874
- * Search for tracks using the configured search source. Returns a ResolvedTrack at the path
875
- * /__search?q=query with children containing results. Always executes a fresh search and caches
876
- * results for onGetSearchResult() retrieval.
795
+ * Runs a fresh search and keeps its results for [getCachedSearchResults].
877
796
  *
878
- * @param params The structured search parameters
879
- * @return ResolvedTrack containing search results as children
797
+ * @throws Exception when the search callback fails; a failed API search yields no results
880
798
  */
881
799
  suspend fun search(params: SearchParams): ResolvedTrack {
882
800
  Timber.d("Executing fresh search for: ${params.query} (mode=${params.mode})")
883
801
 
884
802
  val searchPath = BrowserPathHelper.createSearchPath(params.query)
803
+ val generation = contentGeneration
885
804
 
886
805
  try {
887
- // Execute search. Drop results without a stable identifier (url or src): search results come
888
- // from server/JS data that doesn't pass through validateTrack like browse children do, and
889
- // downstream conversion (TrackFactory.toMedia3) and browsable-result resolution require one.
806
+ // Search results skip validateTrack, so one without a path or src is dropped here:
807
+ // TrackFactory.toMedia3 needs one.
890
808
  val searchResults =
891
809
  resolveSearch(params)
892
810
  .filter { track ->
893
- val valid = track.url != null || track.src != null
811
+ val valid = track.path != null || track.src != null
894
812
  if (!valid) {
895
- Timber.w("Dropping search result without url or src: '${track.title}'")
813
+ Timber.w("Dropping search result without path or src: '${track.title}'")
896
814
  }
897
815
  valid
898
816
  }
899
817
  .toTypedArray()
900
818
 
901
- // Create ResolvedTrack
902
819
  val searchResolvedTrack =
903
820
  ResolvedTrack(
904
821
  id = null,
905
- url = searchPath,
822
+ path = searchPath,
906
823
  title = "Search: ${params.query}",
907
- children = searchResults,
824
+ sections = arrayOf(untitledSection(searchResults)),
825
+ children = null,
908
826
  carPlaySiriListButton = null,
909
827
  artwork = null,
910
828
  artworkSource = null,
911
829
  request = null,
912
- artworkCarPlayTinted = null,
913
830
  artist = null,
914
- albumUrl = null,
831
+ albumPath = null,
915
832
  description = null,
916
833
  subtitle = null,
917
834
  album = null,
@@ -919,17 +836,16 @@ class BrowserManager {
919
836
  duration = null,
920
837
  src = null,
921
838
  style = null,
922
- childrenStyle = null,
839
+ disabled = null,
923
840
  favorited = null,
924
- groupTitle = null,
925
841
  live = null,
926
- imageRow = null,
842
+ icyCharset = null,
927
843
  )
928
844
 
929
- // Cache search results for getCachedSearchResults()
930
- lastSearch = params.query to searchResults
845
+ synchronized(cacheLock) {
846
+ if (generation == contentGeneration) lastSearch = params.query to searchResults
847
+ }
931
848
 
932
- // Cache individual tracks for Media3 lookups
933
849
  cacheChildren(searchResolvedTrack)
934
850
  Timber.d(
935
851
  "Cached search results for query: ${params.query} with ${searchResults.size} results"
@@ -937,146 +853,95 @@ class BrowserManager {
937
853
 
938
854
  return searchResolvedTrack
939
855
  } catch (e: Exception) {
856
+ // Propagates, like iOS `search`: a caller must tell a failed search from an empty one.
940
857
  Timber.e(e, "Error during search for query: ${params.query}")
941
-
942
- // Return empty search result on error
943
- val emptySearchResult =
944
- ResolvedTrack(
945
- id = null,
946
- url = searchPath,
947
- title = "Search: ${params.query}",
948
- children = emptyArray(),
949
- carPlaySiriListButton = null,
950
- artwork = null,
951
- artworkSource = null,
952
- request = null,
953
- artworkCarPlayTinted = null,
954
- artist = null,
955
- albumUrl = null,
956
- description = null,
957
- subtitle = null,
958
- album = null,
959
- genre = null,
960
- duration = null,
961
- src = null,
962
- style = null,
963
- childrenStyle = null,
964
- favorited = null,
965
- groupTitle = null,
966
- live = null,
967
- imageRow = null,
968
- )
969
-
970
- return emptySearchResult
858
+ throw e
971
859
  }
972
860
  }
973
861
 
974
- /**
975
- * Get the current navigation path.
976
- *
977
- * @return Current path string
978
- */
979
862
  fun getPath(): String {
980
863
  return path
981
864
  }
982
865
 
983
- /**
984
- * Get the current loaded content.
985
- *
986
- * @return Current ResolvedTrack content or null if none loaded
987
- */
988
866
  fun getContent(): ResolvedTrack? {
989
867
  return content
990
868
  }
991
869
 
992
- /**
993
- * Get the current cached tabs.
994
- *
995
- * @return Current tabs array or null if none loaded
996
- */
997
870
  fun getTabs(): Array<Track>? {
998
871
  return tabs
999
872
  }
1000
873
 
1001
- /** Set callback for path changes. */
1002
874
  fun setOnPathChanged(callback: (String) -> Unit) {
1003
875
  onPathChanged = callback
1004
876
  }
1005
877
 
1006
- /** Set callback for content changes. */
1007
878
  fun setOnContentChanged(callback: (ResolvedTrack?) -> Unit) {
1008
879
  onContentChanged = callback
1009
880
  }
1010
881
 
1011
- /** Set callback for tabs changes. */
1012
882
  fun setOnTabsChanged(callback: (Array<Track>) -> Unit) {
1013
883
  onTabsChanged = callback
1014
884
  }
1015
885
 
1016
886
  /**
1017
- * Set callback invoked whenever both [artworkResolutions] and the browse-artwork registry are
1018
- * cleared (config swap or content invalidation). The caller should clear any parallel
1019
- * [com.audiobrowser.browser.BrowseArtworkRegistry] instance it owns.
887
+ * Called whenever [artworkResolutions] and the browse-artwork registry are cleared. The caller
888
+ * clears any [BrowseArtworkRegistry] it owns.
1020
889
  */
1021
890
  fun setOnArtworkRegistriesCleared(callback: () -> Unit) {
1022
891
  onArtworkRegistriesCleared = callback
1023
892
  }
1024
893
 
1025
894
  /**
1026
- * Query navigation tabs from the configured tabs source. This is an async operation that resolves
1027
- * the tabs configuration.
1028
- *
1029
- * @return Array of Track objects representing tabs
895
+ * Resolves the tabs once per [clearContentCache]; later calls return that result. The previous
896
+ * tabs stay until new ones resolve.
1030
897
  */
1031
898
  suspend fun queryTabs(): Array<Track> {
1032
- // Return cached tabs if available
1033
- this.tabs?.let {
1034
- return it
1035
- }
899
+ val generation = contentGeneration
900
+ synchronized(cacheLock) { tabs.takeIf { tabsGeneration == generation } }
901
+ ?.let {
902
+ return it
903
+ }
1036
904
 
1037
905
  Timber.d("Getting navigation tabs")
1038
906
 
1039
907
  val tabs = resolveTabs()
1040
908
 
1041
- // Validate tabs have stable identifiers
1042
909
  tabs.forEachIndexed { index, tab ->
1043
910
  validateTrack(tab, "Tab")
1044
- Timber.d("[TABS] Tab[$index] '${tab.title}': url=${tab.url}")
911
+ Timber.d("[TABS] Tab[$index] '${tab.title}': path=${tab.path}")
1045
912
  }
1046
913
 
1047
- this.tabs = tabs
914
+ synchronized(cacheLock) {
915
+ if (generation == contentGeneration) {
916
+ this.tabs = tabs
917
+ tabsGeneration = generation
918
+ }
919
+ }
1048
920
  return tabs
1049
921
  }
1050
922
 
1051
923
  companion object {
1052
- /** Internal path used for the default/root browse source */
1053
924
  internal const val DEFAULT_ROUTE_PATH = "__default__"
1054
925
 
1055
- /** Internal path used for navigation tabs */
1056
926
  internal const val TABS_ROUTE_PATH = "__tabs__"
1057
927
 
1058
- /** Internal path used for search */
1059
928
  internal const val SEARCH_ROUTE_PATH = "__search__"
929
+
930
+ // English, like defaultFormattedError's copy: it still resolves when the JS runtime is gone.
931
+ internal const val DEFAULT_VIEW_MORE_TITLE = "View more"
1060
932
  }
1061
933
 
1062
- /**
1063
- * Find the best matching route entry for a path. Uses SimpleRouter for pattern matching, with
1064
- * __default__ as lowest priority fallback.
1065
- */
1066
934
  private fun findBestRouteMatch(
1067
935
  path: String,
1068
936
  routes: Array<NativeRouteEntry>,
1069
937
  ): Pair<NativeRouteEntry, Map<String, String>>? {
1070
- // Convert to map for router compatibility, excluding default fallback
1071
938
  val routeMap = routes.filter { it.path != DEFAULT_ROUTE_PATH }.associateBy { it.path }
1072
939
 
1073
- // Try to find a specific route match
1074
940
  router.findBestMatch(path, routeMap)?.let { (routePattern, match) ->
1075
941
  val routeEntry = routeMap[routePattern]!!
1076
942
  return Pair(routeEntry, match.params)
1077
943
  }
1078
944
 
1079
- // Fall back to default route if present
1080
945
  routes
1081
946
  .find { it.path == DEFAULT_ROUTE_PATH }
1082
947
  ?.let { defaultRoute ->
@@ -1086,23 +951,15 @@ class BrowserManager {
1086
951
  return null
1087
952
  }
1088
953
 
1089
- /**
1090
- * Resolve a NativeRouteEntry into a ResolvedTrack. The entry has flattened browse options:
1091
- * callback, config, or static.
1092
- */
1093
954
  private suspend fun resolveRouteEntry(
1094
955
  entry: NativeRouteEntry,
1095
956
  path: String,
1096
957
  routeParams: Map<String, String>,
1097
958
  ): ResolvedTrack {
1098
- // Priority: callback > config > static
1099
959
  entry.browseCallback?.let { callback ->
1100
960
  Timber.d("Resolving route via callback")
1101
961
  val param = BrowserSourceCallbackParam(path, routeParams)
1102
- // BrowserSourceCallback may return a BrowseResult synchronously or via a
1103
- // Promise. Nitro flattens (ResolvedTrack | BrowseError) | Promise<BrowseResult>
1104
- // into a 3-arm variant: sync track, sync error, or a Promise resolving to a
1105
- // BrowseResult (which is itself a ResolvedTrack | BrowseError variant).
962
+ // Nitro flattens `(ResolvedTrack | BrowseError) | Promise<BrowseResult>` into three arms.
1106
963
  return callback
1107
964
  .invoke(param)
1108
965
  .await()
@@ -1133,13 +990,9 @@ class BrowserManager {
1133
990
  throw ContentNotFoundException(path)
1134
991
  }
1135
992
 
1136
- /**
1137
- * Resolve search via the __search__ route entry. The entry has searchCallback or searchConfig.
1138
- */
1139
993
  private suspend fun resolveSearch(params: SearchParams): Array<Track> {
1140
994
  val routes = config.routes ?: return emptyArray()
1141
995
 
1142
- // Find the __search__ route entry
1143
996
  val searchEntry = routes.find { it.path == SEARCH_ROUTE_PATH }
1144
997
  if (searchEntry == null) {
1145
998
  Timber.w("No search route configured")
@@ -1162,14 +1015,9 @@ class BrowserManager {
1162
1015
  return emptyArray()
1163
1016
  }
1164
1017
 
1165
- /**
1166
- * Resolve tabs via the __tabs__ route entry. Returns children of the resolved track, or empty
1167
- * array if no tabs configured.
1168
- */
1169
1018
  private suspend fun resolveTabs(): Array<Track> {
1170
1019
  val routes = config.routes ?: return emptyArray()
1171
1020
 
1172
- // Find the __tabs__ route entry
1173
1021
  val tabsEntry = routes.find { it.path == TABS_ROUTE_PATH }
1174
1022
  if (tabsEntry == null) {
1175
1023
  Timber.d("No tabs route configured")
@@ -1179,38 +1027,25 @@ class BrowserManager {
1179
1027
  Timber.d("Resolving tabs via route entry")
1180
1028
  val resolvedTrack = resolveRouteEntry(tabsEntry, TABS_ROUTE_PATH, emptyMap())
1181
1029
 
1182
- return resolvedTrack.children ?: emptyArray()
1030
+ return resolvedTrack.flattenedChildren?.toTypedArray() ?: emptyArray()
1183
1031
  }
1184
1032
 
1185
- /**
1186
- * Resolves a single request/browse layer. When a resolver thunk is present it is invoked and its
1187
- * result awaited. The resolver is Promise-only (the TS layer normalizes a sync-or-async thunk via
1188
- * Promise.resolve), so its native shape is `Promise<Promise<TransformableRequestConfig>>` — a
1189
- * double await. When there is no resolver the static layer config is returned as-is.
1190
- */
1191
1033
  private suspend fun resolveLayer(
1192
1034
  staticConfig: TransformableRequestConfig?,
1193
1035
  resolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?,
1194
1036
  ): TransformableRequestConfig? {
1195
1037
  if (resolver == null) return staticConfig
1196
- // Promise-only resolver (the TS layer wraps a sync-or-async thunk in
1197
- // Promise.resolve) → double await: the bridge promise, then the JS promise.
1038
+ // The TS layer wraps the thunk in Promise.resolve: await the bridge promise, then the JS one.
1198
1039
  return resolver.invoke().await().await()
1199
1040
  }
1200
1041
 
1201
- /**
1202
- * Ensures the request/browse resolver layers are resolved for the current [layerGeneration],
1203
- * caching the result. Re-resolves when the generation changes (config set or content
1204
- * invalidation). Uses a simple generation guard with no in-flight cache: a benign idempotent
1205
- * double-resolve under concurrent first-requests is acceptable, and on a thrown resolver nothing
1206
- * is cached so the next request retries naturally.
1207
- */
1042
+ // No in-flight dedupe: concurrent first requests may both resolve, which is harmless, and a
1043
+ // resolver that throws caches nothing, so the next request retries.
1208
1044
  internal suspend fun ensureLayersResolved() {
1209
1045
  if (resolvedLayerGeneration == layerGeneration) return
1210
1046
  val generation = layerGeneration
1211
1047
  val req = resolveLayer(config.request, config.requestResolver)
1212
1048
  val brw = resolveLayer(config.browse, config.browseResolver)
1213
- // A newer generation started while we were awaiting — drop this stale result.
1214
1049
  if (generation != layerGeneration) return
1215
1050
  resolvedRequestLayer = req
1216
1051
  resolvedBrowseLayer = brw
@@ -1218,13 +1053,8 @@ class BrowserManager {
1218
1053
  }
1219
1054
 
1220
1055
  /**
1221
- * Ensures the request layer is resolved for the current generation and returns it (the resolver
1222
- * result when a [BrowserConfig.requestResolver] is configured, else the static
1223
- * [BrowserConfig.request]).
1224
- *
1225
- * Consumers outside the browse path (media URL building, artwork) must obtain the request layer
1226
- * through this accessor rather than reading the static `config.request`, so a resolver-only
1227
- * consumer still gets a baseUrl/headers/transform for media, artwork, and now-playing artwork.
1056
+ * The request layer for the current generation. Media URLs and artwork read it through here,
1057
+ * never `config.request`, which a resolver-only config leaves unset.
1228
1058
  */
1229
1059
  internal suspend fun resolvedRequestConfig(): TransformableRequestConfig? {
1230
1060
  ensureLayersResolved()
@@ -1232,20 +1062,33 @@ class BrowserManager {
1232
1062
  }
1233
1063
 
1234
1064
  /**
1235
- * Builds the HTTP request for an API-backed path by layering request (shared) → kind
1236
- * (browse/search) → route configs. Each layer's transform receives the previous layer's output; a
1237
- * layer with no transform merges its static fields.
1238
- *
1239
- * `initialQuery` seeds query params onto the BASE the kind layer receives (e.g. search q/mode/…):
1240
- * a layer with a transform "wins completely" and is handed only the base, so params placed on a
1241
- * layer's own static query would be dropped before the transform runs. The same goes for `path`:
1242
- * it is carried from the base through every layer (only a transform may change it), so a kind
1243
- * whose config supplies the path (search) must seed it via the `path` parameter. Mirrors iOS
1244
- * `buildApiRequest`.
1065
+ * The title of the "view more" row appended to a pathed section where the header can't be tapped
1066
+ * (Android Auto). Re-read once per generation, so invalidateAllContent picks up a new language.
1067
+ * Falls back to [DEFAULT_VIEW_MORE_TITLE] when unset, blank or throwing.
1068
+ */
1069
+ internal suspend fun viewMoreTitle(): String {
1070
+ val generation = layerGeneration
1071
+ if (resolvedViewMoreTitleGeneration == generation) return resolvedViewMoreTitle
1072
+ val title =
1073
+ try {
1074
+ config.viewMoreTitle?.invoke()?.await()?.takeIf { it.isNotBlank() }
1075
+ } catch (e: Exception) {
1076
+ Timber.e(e, "viewMoreTitle callback failed; falling back to the default")
1077
+ null
1078
+ } ?: DEFAULT_VIEW_MORE_TITLE
1079
+ if (generation != layerGeneration) return title
1080
+ resolvedViewMoreTitle = title
1081
+ resolvedViewMoreTitleGeneration = generation
1082
+ return title
1083
+ }
1084
+
1085
+ /**
1086
+ * Layers request → kind (browse/search) → route; each transform receives the previous output.
1087
+ * [path] seeds the base because no layer's static path ever applies; [initialQuery] seeds it
1088
+ * because a layer with a transform receives only the base, so its static query never applies.
1089
+ * Mirrors iOS `buildApiRequest`.
1245
1090
  *
1246
- * @throws ContentNotFoundException when no layer supplies a baseUrl — there is nothing to fetch,
1247
- * so the path is genuinely "not found" rather than a network error (mirrors iOS's `guard let
1248
- * baseUrl`).
1091
+ * @throws ContentNotFoundException when no layer supplies a baseUrl
1249
1092
  */
1250
1093
  internal suspend fun buildApiRequest(
1251
1094
  kindConfig: TransformableRequestConfig?,
@@ -1254,7 +1097,6 @@ class BrowserManager {
1254
1097
  params: Map<String, String>,
1255
1098
  initialQuery: Map<String, String>? = null,
1256
1099
  ): HttpClient.HttpRequest {
1257
- // Resolve the request/browse resolver thunks once per content generation (cached).
1258
1100
  ensureLayersResolved()
1259
1101
 
1260
1102
  var merged =
@@ -1281,27 +1123,20 @@ class BrowserManager {
1281
1123
  return RequestConfigBuilder.buildHttpRequest(merged)
1282
1124
  }
1283
1125
 
1284
- /**
1285
- * Execute an API request for browser content. Request building (layering + transforms + baseUrl
1286
- * guard) lives in [buildApiRequest]; this adds the browse-specific response shape (a
1287
- * ResolvedTrack page object).
1288
- */
1289
1126
  private suspend fun executeApiRequest(
1290
1127
  apiConfig: TransformableRequestConfig?,
1291
1128
  path: String,
1292
1129
  routeParams: Map<String, String>,
1293
1130
  ): ResolvedTrack {
1294
1131
  return withContext(Dispatchers.IO) {
1295
- // request (shared) → browse (kind) → route. apiConfig is null for the
1296
- // implicit default (an unmatched browse path → fetch via request + browse + path).
1297
1132
  ensureLayersResolved()
1133
+ // apiConfig is null for the implicit default.
1298
1134
  val httpRequest = buildApiRequest(resolvedBrowseLayer, apiConfig, path, routeParams)
1299
1135
  val response = httpClient.request(httpRequest)
1300
1136
 
1301
1137
  response.fold(
1302
1138
  onSuccess = { httpResponse ->
1303
1139
  if (httpResponse.isSuccessful) {
1304
- // 3. Parse response as ResolvedTrack
1305
1140
  val jsonResolvedTrack = json.decodeFromString<JsonResolvedTrack>(httpResponse.body)
1306
1141
  jsonResolvedTrack.toNitro()
1307
1142
  } else {
@@ -1319,16 +1154,6 @@ class BrowserManager {
1319
1154
  }
1320
1155
  }
1321
1156
 
1322
- /**
1323
- * Execute an API request for search results. Automatically adds search parameters to request
1324
- * query:
1325
- * - q: The search query string (always included)
1326
- * - mode: The search mode (any, genre, artist, album, song, playlist) - omitted for unstructured
1327
- * search
1328
- * - genre, artist, album, title, playlist: Included only when non-null
1329
- *
1330
- * Transform callbacks can access and modify all parameters as needed.
1331
- */
1332
1157
  private suspend fun executeSearchApiRequest(
1333
1158
  apiConfig: TransformableRequestConfig,
1334
1159
  params: SearchParams,
@@ -1346,15 +1171,12 @@ class BrowserManager {
1346
1171
  params.playlist?.let { put("playlist", it) }
1347
1172
  }
1348
1173
 
1349
- // request (shared) → search (kind); no browse layer and no route — search
1350
- // is its own kind. The search params seed the base (see buildApiRequest
1351
- // docs), and so does the search config's path: a layer's static path
1352
- // never applies (the path is carried from the base), so the caller
1353
- // seeds it — mirrors the web stub's fetchSearchResults.
1174
+ // No browse layer and no route: search is its own kind.
1354
1175
  val httpRequest =
1355
1176
  buildApiRequest(
1356
1177
  kindConfig = apiConfig,
1357
1178
  routeConfig = null,
1179
+ // A layer's static path never applies, so the search config's path seeds the base.
1358
1180
  path = apiConfig.path,
1359
1181
  params = emptyMap(),
1360
1182
  initialQuery = searchQueryParams,
@@ -1364,8 +1186,7 @@ class BrowserManager {
1364
1186
  response.fold(
1365
1187
  onSuccess = { httpResponse ->
1366
1188
  if (httpResponse.isSuccessful) {
1367
- // The search endpoint returns a bare Track array (unlike browse,
1368
- // which returns a page object). iOS parses it the same way.
1189
+ // A bare Track array, unlike browse's page object.
1369
1190
  val jsonTracks = json.decodeFromString<List<JsonTrack>>(httpResponse.body)
1370
1191
  jsonTracks.map { it.toNitro() }.toTypedArray()
1371
1192
  } else {
@@ -1388,49 +1209,36 @@ class BrowserManager {
1388
1209
  }
1389
1210
  }
1390
1211
 
1391
- /** Exception thrown when no content is configured for a requested path. */
1392
1212
  class ContentNotFoundException(val path: String) : Exception("Content not found")
1393
1213
 
1394
- /** Exception thrown when an HTTP request fails with a non-2xx status code. */
1395
1214
  class HttpStatusException(val statusCode: Int, message: String) : Exception(message)
1396
1215
 
1397
- /** Exception thrown when a network request fails (connection error, timeout, etc). */
1398
1216
  class NetworkException(message: String, cause: Throwable? = null) : Exception(message, cause)
1399
1217
 
1400
- /** Exception thrown when a browse callback returns an error message. */
1401
1218
  class CallbackException(message: String) : Exception(message)
1402
1219
 
1403
- /**
1404
- * Configuration object that holds all browser settings. Uses flattened structure matching
1405
- * NativeBrowserConfiguration from JS.
1406
- */
1220
+ /** Mirrors NativeBrowserConfiguration from JS. */
1407
1221
  data class BrowserConfig(
1408
1222
  val request: TransformableRequestConfig? = null,
1409
- // Resolver thunk for the shared request layer. When set, it is resolved once per content
1410
- // generation (re-resolved after invalidateAllContent), cached, and merged per request — instead
1411
- // of carrying a static `request`. `request` and `requestResolver` are mutually exclusive in
1412
- // practice (the consumer sets one or the other), but both are merged if present.
1223
+ // Resolved once per content generation and merged per request. When set, it replaces `request`,
1224
+ // which is then ignored (the JS bridge sets only one of the two).
1413
1225
  val requestResolver:
1414
1226
  Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____? =
1415
1227
  null,
1416
1228
  val browse: TransformableRequestConfig? = null,
1417
- // Resolver thunk for the browse layer. See `requestResolver`.
1418
1229
  val browseResolver:
1419
1230
  Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____? =
1420
1231
  null,
1421
1232
  val media: MediaRequestConfig? = null,
1422
1233
  val artwork: ArtworkRequestConfig? = null,
1423
- // Now-playing-only artwork configuration (lock screen / notification / Android Auto now-playing).
1424
- // A distinct kind from `artwork`; the now-playing path falls back to `artwork` when this is null.
1234
+ // Falls back to `artwork` when null.
1425
1235
  val nowPlayingArtwork: ArtworkRequestConfig? = null,
1426
- // Routes as array with flattened entries (includes __tabs__, __search__, and __default__ special
1427
- // routes)
1236
+ // Includes the special __tabs__, __search__ and __default__ routes.
1428
1237
  val routes: Array<NativeRouteEntry>? = null,
1429
- // Behavior
1430
1238
  val singleTrack: Boolean = false,
1431
1239
  val androidControllerOfflineError: Boolean = true,
1240
+ val viewMoreTitle: (() -> Promise<String>)? = null,
1432
1241
  ) {
1433
- /** Returns true if search functionality is configured (either callback or config). */
1434
1242
  val hasSearch: Boolean
1435
1243
  get() {
1436
1244
  val searchEntry = routes?.find { it.path == BrowserManager.SEARCH_ROUTE_PATH }