react-native-audio-browser 0.2.0-next.8 → 0.2.0-next.80

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