react-native-audio-browser 0.2.0-next.9 → 0.2.0-next.91

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 (1275) hide show
  1. package/AudioBrowser.podspec +1 -1
  2. package/README.md +68 -39
  3. package/android/build.gradle +53 -14
  4. package/android/gradle.properties +3 -3
  5. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +213 -0
  6. package/android/src/main/AndroidManifest.xml +14 -1
  7. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +582 -456
  8. package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +34 -0
  9. package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +16 -2
  10. package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
  11. package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +126 -0
  12. package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
  13. package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +222 -0
  14. package/android/src/main/java/com/audiobrowser/Service.kt +101 -104
  15. package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +15 -17
  16. package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
  17. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +30 -14
  18. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +358 -541
  19. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +36 -66
  20. package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +228 -0
  21. package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
  22. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +86 -64
  23. package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
  24. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +52 -28
  25. package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
  26. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
  27. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +12 -19
  28. package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
  29. package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
  30. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -11
  31. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +18 -0
  32. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +11 -0
  33. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +25 -17
  34. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +28 -42
  35. package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +23 -0
  36. package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +12 -13
  37. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +32 -27
  38. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
  39. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +92 -49
  40. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
  41. package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +65 -0
  42. package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
  43. package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +67 -0
  44. package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +16 -19
  45. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +113 -50
  46. package/android/src/main/java/com/audiobrowser/player/LiveStreamExtractor.kt +65 -0
  47. package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
  48. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +75 -65
  49. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +600 -345
  50. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +108 -153
  51. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +110 -116
  52. package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
  53. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +62 -38
  54. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +119 -132
  55. package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
  56. package/android/src/main/java/com/audiobrowser/player/Player.kt +686 -600
  57. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
  58. package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +18 -28
  59. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +171 -178
  60. package/android/src/main/java/com/audiobrowser/player/ReconnectPacer.kt +96 -0
  61. package/android/src/main/java/com/audiobrowser/player/RetryFocus.kt +126 -0
  62. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +65 -210
  63. package/android/src/main/java/com/audiobrowser/player/RetryLocks.kt +52 -0
  64. package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +310 -0
  65. package/android/src/main/java/com/audiobrowser/player/RetryView.kt +31 -0
  66. package/android/src/main/java/com/audiobrowser/player/SessionViewListener.kt +168 -0
  67. package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +24 -0
  68. package/android/src/main/java/com/audiobrowser/player/SilenceBudget.kt +89 -0
  69. package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
  70. package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
  71. package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +53 -68
  72. package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
  73. package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +65 -0
  74. package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +104 -0
  75. package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
  76. package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +117 -0
  77. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +742 -0
  78. package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +105 -0
  79. package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +39 -0
  80. package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +59 -0
  81. package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +91 -0
  82. package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +98 -0
  83. package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +69 -0
  84. package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +128 -0
  85. package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +538 -0
  86. package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +97 -0
  87. package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +203 -0
  88. package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
  89. package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +67 -0
  90. package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
  91. package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +68 -0
  92. package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +61 -0
  93. package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +70 -0
  94. package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +62 -43
  95. package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +151 -0
  96. package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +53 -18
  97. package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +26 -13
  98. package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +231 -77
  99. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
  100. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +39 -0
  101. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
  102. package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
  103. package/android/src/main/java/com/audiobrowser/util/Automotive.kt +13 -0
  104. package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +45 -0
  105. package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
  106. package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
  107. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +50 -93
  108. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
  109. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
  110. package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
  111. package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
  112. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +25 -24
  113. package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +10 -10
  114. package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +25 -56
  115. package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +39 -46
  116. package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
  117. package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -7
  118. package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
  119. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
  120. package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
  121. package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
  122. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +96 -83
  123. package/android/src/main/res/values/strings.xml +25 -5
  124. package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +16 -0
  125. package/android/src/test/java/androidx/media3/session/SessionViews.kt +38 -0
  126. package/android/src/test/java/com/audiobrowser/AudioFixtures.kt +32 -0
  127. package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +151 -0
  128. package/android/src/test/java/com/audiobrowser/GateDecisionTest.kt +128 -0
  129. package/android/src/test/java/com/audiobrowser/LaunchSettledTest.kt +81 -0
  130. package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +90 -0
  131. package/android/src/test/java/com/audiobrowser/NetworkFixtures.kt +25 -0
  132. package/android/src/test/java/com/audiobrowser/RemoteOutputRoutesTest.kt +29 -0
  133. package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +81 -0
  134. package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +93 -0
  135. package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +24 -4
  136. package/android/src/test/java/com/audiobrowser/ServiceFixtures.kt +48 -0
  137. package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +290 -0
  138. package/android/src/test/java/com/audiobrowser/SessionPositionUpdatesTest.kt +114 -0
  139. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -42
  140. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
  141. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
  142. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +143 -0
  143. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +172 -0
  144. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +87 -25
  145. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +356 -8
  146. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +69 -13
  147. package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +292 -0
  148. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -3
  149. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +163 -0
  150. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +116 -53
  151. package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
  152. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +149 -0
  153. package/android/src/test/java/com/audiobrowser/browser/TrackLoadHandlerTest.kt +44 -0
  154. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +37 -0
  155. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +36 -0
  156. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +70 -16
  157. package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
  158. package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +35 -0
  159. package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +208 -0
  160. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +459 -0
  161. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +4 -14
  162. package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +87 -0
  163. package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
  164. package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -9
  165. package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
  166. package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +243 -0
  167. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +137 -0
  168. package/android/src/test/java/com/audiobrowser/player/LiveStreamEndTest.kt +316 -0
  169. package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +102 -0
  170. package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
  171. package/android/src/test/java/com/audiobrowser/player/NowPlayingFormatterTest.kt +75 -0
  172. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +251 -21
  173. package/android/src/test/java/com/audiobrowser/player/PlayFromSearchTest.kt +108 -0
  174. package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
  175. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +90 -38
  176. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +50 -0
  177. package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
  178. package/android/src/test/java/com/audiobrowser/player/PlayerBrowserTest.kt +62 -0
  179. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +172 -0
  180. package/android/src/test/java/com/audiobrowser/player/PlayerDestroyTest.kt +60 -0
  181. package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
  182. package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +66 -0
  183. package/android/src/test/java/com/audiobrowser/player/PlayerRemoteOutputsSeekTest.kt +105 -0
  184. package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +607 -0
  185. package/android/src/test/java/com/audiobrowser/player/PlayerSetupEndedTest.kt +195 -0
  186. package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +147 -0
  187. package/android/src/test/java/com/audiobrowser/player/PlayerSleepTimerTest.kt +38 -0
  188. package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +235 -0
  189. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +354 -0
  190. package/android/src/test/java/com/audiobrowser/player/PlayerTrackChangeTest.kt +222 -0
  191. package/android/src/test/java/com/audiobrowser/player/RetryCaseTest.kt +125 -0
  192. package/android/src/test/java/com/audiobrowser/player/RetryFocusTest.kt +97 -0
  193. package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +93 -200
  194. package/android/src/test/java/com/audiobrowser/player/RetryLocksTest.kt +48 -0
  195. package/android/src/test/java/com/audiobrowser/player/RetryLoopCaseTest.kt +181 -0
  196. package/android/src/test/java/com/audiobrowser/player/RetryLoopTest.kt +221 -0
  197. package/android/src/test/java/com/audiobrowser/player/RetryMaskingTest.kt +178 -0
  198. package/android/src/test/java/com/audiobrowser/player/SessionPlayTest.kt +212 -0
  199. package/android/src/test/java/com/audiobrowser/player/SessionViewListenerTest.kt +225 -0
  200. package/android/src/test/java/com/audiobrowser/player/SessionViewRulesTest.kt +62 -0
  201. package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +234 -0
  202. package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +72 -0
  203. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +149 -0
  204. package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +61 -23
  205. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +309 -0
  206. package/android/src/test/java/com/audiobrowser/remote/RemoteItemTest.kt +61 -0
  207. package/android/src/test/java/com/audiobrowser/remote/RemoteOutputsControllerTest.kt +77 -0
  208. package/android/src/test/java/com/audiobrowser/remote/RemoteQueueTest.kt +101 -0
  209. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +1037 -0
  210. package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +201 -0
  211. package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +89 -0
  212. package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +70 -0
  213. package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +134 -0
  214. package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +169 -0
  215. package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +176 -0
  216. package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +690 -0
  217. package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
  218. package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +199 -0
  219. package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
  220. package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +200 -0
  221. package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +97 -0
  222. package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
  223. package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +181 -15
  224. package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +315 -8
  225. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +298 -0
  226. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +78 -1
  227. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
  228. package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
  229. package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +136 -0
  230. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +51 -16
  231. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
  232. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
  233. package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
  234. package/android/src/test/java/com/audiobrowser/util/JsPromise.kt +44 -0
  235. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +154 -0
  236. package/android/src/test/java/com/audiobrowser/util/NetworkConnectivityMonitorTest.kt +108 -0
  237. package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +97 -0
  238. package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -10
  239. package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
  240. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +11 -13
  241. package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +91 -1
  242. package/android/src/test/resources/sonos/device_description.xml +78 -0
  243. package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +56 -0
  244. package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +80 -0
  245. package/ios/AVPlayerEngine.swift +363 -0
  246. package/ios/AVPlayerEngineCallbacks.swift +12 -0
  247. package/ios/Browser/BrowseGate.swift +70 -0
  248. package/ios/Browser/BrowserConfig.swift +123 -104
  249. package/ios/Browser/BrowserError.swift +15 -0
  250. package/ios/Browser/BrowserManager.swift +153 -675
  251. package/ios/Browser/BrowserPathHelper.swift +54 -117
  252. package/ios/Browser/FavoriteSet.swift +43 -0
  253. package/ios/Browser/InertStyleDiagnostic.swift +231 -0
  254. package/ios/Browser/JsonModels.swift +244 -335
  255. package/ios/Browser/NavigationErrorState.swift +42 -0
  256. package/ios/Browser/PageResolver.swift +132 -0
  257. package/ios/Browser/RequestLayer.swift +185 -0
  258. package/ios/Browser/RequestPipeline.swift +295 -0
  259. package/ios/Browser/SearchDrillIn.swift +10 -16
  260. package/ios/Browser/SectionScope.swift +73 -26
  261. package/ios/Browser/SimpleRouter.swift +76 -154
  262. package/ios/Browser/StyleResolver.swift +41 -0
  263. package/ios/Browser/TabBarEntries.swift +8 -7
  264. package/ios/Browser/TrackIdTemplate.swift +29 -0
  265. package/ios/CarPlay/CPInterfaceController+Safe.swift +102 -61
  266. package/ios/CarPlay/CarPlayArtworkResolver.swift +32 -83
  267. package/ios/CarPlay/CarPlayController.swift +37 -1297
  268. package/ios/CarPlay/CarPlayImageLoader.swift +85 -172
  269. package/ios/CarPlay/CarPlayListItemFactory.swift +240 -104
  270. package/ios/CarPlay/CarPlayNowPlayingManager.swift +147 -218
  271. package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
  272. package/ios/CarPlay/CarPlaySession+PageLoader.swift +93 -0
  273. package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
  274. package/ios/CarPlay/CarPlaySession+TabBar.swift +185 -0
  275. package/ios/CarPlay/CarPlaySession.swift +203 -0
  276. package/ios/CarPlay/CarPlayTemplates.swift +62 -0
  277. package/ios/CarPlay/IntentHandlers.swift +94 -0
  278. package/ios/CarPlay/MediaIntentCriteria.swift +91 -0
  279. package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +15 -17
  280. package/ios/CarPlay/MediaIntentPlayback.swift +86 -0
  281. package/ios/CarPlay/NowPlayingButtonRules.swift +34 -0
  282. package/ios/CarPlay/RNABAudioBrowser.m +7 -15
  283. package/ios/CarPlay/SectionPresentation.swift +67 -0
  284. package/ios/CarPlay/TopTemplateReplacer.swift +95 -0
  285. package/ios/Extension/Capability+RemoteCommand.swift +22 -69
  286. package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
  287. package/ios/Extension/CxxVectorConformances.swift +4 -16
  288. package/ios/Extension/NavigationError+Conversion.swift +17 -10
  289. package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -16
  290. package/ios/Extension/Promise+AwaitCallback.swift +33 -0
  291. package/ios/Extension/RequestConfig+Copying.swift +2 -6
  292. package/ios/Extension/ResolvedTrack+Copying.swift +14 -22
  293. package/ios/Extension/SearchParams+Query.swift +28 -0
  294. package/ios/Extension/Section+Copying.swift +26 -0
  295. package/ios/Extension/String+IcyCharset.swift +21 -0
  296. package/ios/Extension/TimedMetadata+AVFoundation.swift +10 -14
  297. package/ios/Extension/Track+AVPlayer.swift +1 -18
  298. package/ios/Extension/Track+Copying.swift +13 -21
  299. package/ios/Extension/Track+Identity.swift +20 -0
  300. package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
  301. package/ios/Extension/UIApplication+ActiveScene.swift +19 -0
  302. package/ios/Extension/UIImage+Adaptive.swift +12 -0
  303. package/ios/Extension/URLError+Connectivity.swift +15 -0
  304. package/ios/Extension/Variant+Artwork.swift +8 -22
  305. package/ios/Http/HttpClient.swift +73 -167
  306. package/ios/HybridAudioBrowser+Browser.swift +134 -0
  307. package/ios/HybridAudioBrowser+Options.swift +116 -0
  308. package/ios/HybridAudioBrowser+Player.swift +347 -0
  309. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +156 -0
  310. package/ios/HybridAudioBrowser+Stubs.swift +44 -0
  311. package/ios/HybridAudioBrowser.swift +147 -1718
  312. package/ios/Model/NitroTypeStubs.swift +266 -32
  313. package/ios/Model/PlayerUpdateOptions.swift +13 -19
  314. package/ios/Model/RemoteCommand.swift +6 -78
  315. package/ios/Model/TrackPlayerError.swift +12 -21
  316. package/ios/NowPlayingInfo/NowPlayingInfoController.swift +28 -82
  317. package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
  318. package/ios/Observer/ItemObserver.swift +92 -0
  319. package/ios/Observer/PlayerObserver.swift +59 -0
  320. package/ios/Option/SessionCategories.swift +41 -92
  321. package/ios/PlaybackEvent.swift +4 -2
  322. package/ios/Player/AirPlayStallJudgement.swift +7 -9
  323. package/ios/Player/AudioSessionController.swift +190 -0
  324. package/ios/Player/DeferredSeek.swift +73 -0
  325. package/ios/Player/ErrorStatus.swift +56 -0
  326. package/ios/Player/MediaLoader.swift +73 -98
  327. package/ios/Player/NowPlayingLines.swift +49 -0
  328. package/ios/Player/NowPlayingUpdater.swift +180 -105
  329. package/ios/Player/PersistedPlaybackState.swift +1 -2
  330. package/ios/Player/PlaybackFailure.swift +121 -0
  331. package/ios/Player/PlaybackPersistence.swift +72 -0
  332. package/ios/Player/PlaybackStateMachine.swift +15 -14
  333. package/ios/Player/PlaybackTimer.swift +11 -8
  334. package/ios/Player/Player.swift +1030 -0
  335. package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
  336. package/ios/Player/PlayerEngine.swift +109 -0
  337. package/ios/Player/PlayerStatusTypes.swift +1 -6
  338. package/ios/Player/QueueManager.swift +80 -98
  339. package/ios/Player/ReconnectPacer.swift +83 -0
  340. package/ios/Player/RetryLoop.swift +374 -0
  341. package/ios/Player/ShuffleOrder.swift +36 -43
  342. package/ios/Player/SilenceBudget.swift +78 -0
  343. package/ios/Player/SleepTimerManager.swift +25 -42
  344. package/ios/Player/VolumeFader.swift +20 -15
  345. package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -20
  346. package/ios/RemoteCommand/RemoteCommandController.swift +99 -337
  347. package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
  348. package/ios/Tests/ArtworkFreshnessTests.swift +67 -0
  349. package/ios/Tests/AwaitCallbackTests.swift +210 -0
  350. package/ios/Tests/BrowseGateTests.swift +50 -0
  351. package/ios/Tests/BrowserPathHelperTests.swift +89 -18
  352. package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
  353. package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
  354. package/ios/Tests/ConcurrentMapTests.swift +42 -0
  355. package/ios/Tests/ConnectivityTests.swift +13 -0
  356. package/ios/Tests/DeferredSeekTests.swift +76 -0
  357. package/ios/Tests/EmitterTests.swift +22 -39
  358. package/ios/Tests/ErrorStatusTests.swift +50 -0
  359. package/ios/Tests/FavoriteSetTests.swift +61 -0
  360. package/ios/Tests/GenerationMemoTests.swift +178 -0
  361. package/ios/Tests/InertStyleDiagnosticTests.swift +203 -0
  362. package/ios/Tests/JsonModelsTests.swift +189 -3
  363. package/ios/Tests/LRUCacheTests.swift +106 -0
  364. package/ios/Tests/MediaIntentCriteriaTests.swift +58 -52
  365. package/ios/Tests/MediaIntentDeadlineTests.swift +75 -0
  366. package/ios/Tests/MediaLoaderTests.swift +38 -78
  367. package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
  368. package/ios/Tests/NowPlayingLinesTests.swift +66 -0
  369. package/ios/Tests/ObserverTests.swift +88 -0
  370. package/ios/Tests/PlaybackErrorTests.swift +74 -0
  371. package/ios/Tests/PlaybackFailureTests.swift +188 -0
  372. package/ios/Tests/PlaybackPersistenceTests.swift +94 -0
  373. package/ios/Tests/PlaybackStateMachineTests.swift +7 -22
  374. package/ios/Tests/PlaybackTimerTests.swift +2 -3
  375. package/ios/Tests/PlayerInvalidTrackTests.swift +65 -0
  376. package/ios/Tests/PlayerPolicyTests.swift +1386 -0
  377. package/ios/Tests/PlayerTests.swift +1677 -0
  378. package/ios/Tests/PlayingStateTests.swift +41 -0
  379. package/ios/Tests/QueueManagerTests.swift +205 -174
  380. package/ios/Tests/ReadyValueTests.swift +73 -0
  381. package/ios/Tests/RemoteCommandControllerTests.swift +65 -48
  382. package/ios/Tests/RequestLayerTests.swift +228 -0
  383. package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -37
  384. package/ios/Tests/RetryCaseTests.swift +146 -0
  385. package/ios/Tests/RetryLoopTests.swift +486 -0
  386. package/ios/Tests/SearchDrillInTests.swift +16 -17
  387. package/ios/Tests/SearchParamsQueryTests.swift +48 -0
  388. package/ios/Tests/SectionPresentationTests.swift +85 -0
  389. package/ios/Tests/SectionScopeTests.swift +136 -54
  390. package/ios/Tests/SimpleRouterTests.swift +39 -8
  391. package/ios/Tests/SleepTimerManagerTests.swift +68 -47
  392. package/ios/Tests/StyleResolverTests.swift +123 -0
  393. package/ios/Tests/SupersedingTaskTests.swift +148 -0
  394. package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
  395. package/ios/Tests/Support/TestTypes.swift +236 -93
  396. package/ios/Tests/Support/TimeLimit.swift +43 -0
  397. package/ios/Tests/TabBarEntriesTests.swift +18 -20
  398. package/ios/Tests/TimedMetadataAVFoundationTests.swift +43 -2
  399. package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
  400. package/ios/Tests/TrackIdTemplateTests.swift +63 -0
  401. package/ios/Tests/TrackIdentityTests.swift +20 -0
  402. package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
  403. package/ios/Tests/TrackSelectorTests.swift +157 -34
  404. package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
  405. package/ios/TrackSelector.swift +67 -77
  406. package/ios/Util/ArtworkFreshness.swift +42 -0
  407. package/ios/Util/ArtworkImageFetcher.swift +143 -6
  408. package/ios/Util/AwaitCallback.swift +80 -0
  409. package/ios/Util/ConcurrentMap.swift +19 -0
  410. package/ios/Util/Connectivity.swift +12 -0
  411. package/ios/Util/Deadline.swift +38 -0
  412. package/ios/Util/Emitter.swift +45 -22
  413. package/ios/Util/GenerationMemo.swift +43 -0
  414. package/ios/Util/LRUCache.swift +23 -159
  415. package/ios/Util/NetworkMonitor.swift +31 -33
  416. package/ios/Util/OutputPicker.swift +48 -0
  417. package/ios/Util/ReadyValue.swift +57 -0
  418. package/ios/Util/SFSymbolRenderer.swift +64 -49
  419. package/ios/Util/SVGProcessor.swift +9 -16
  420. package/ios/Util/SupersedingTask.swift +45 -0
  421. package/lib/commonjs/AudioBrowser.js +11 -0
  422. package/lib/commonjs/AudioBrowser.js.map +1 -1
  423. package/lib/commonjs/CLAUDE.md +57 -0
  424. package/lib/commonjs/features/battery.js +16 -12
  425. package/lib/commonjs/features/battery.js.map +1 -1
  426. package/lib/commonjs/features/browser-config.js +13 -9
  427. package/lib/commonjs/features/browser-config.js.map +1 -1
  428. package/lib/commonjs/features/browser.js +78 -20
  429. package/lib/commonjs/features/browser.js.map +1 -1
  430. package/lib/commonjs/features/carConnection.js +3 -4
  431. package/lib/commonjs/features/carConnection.js.map +1 -1
  432. package/lib/commonjs/features/equalizer.js +9 -5
  433. package/lib/commonjs/features/equalizer.js.map +1 -1
  434. package/lib/commonjs/features/errors.js +35 -21
  435. package/lib/commonjs/features/errors.js.map +1 -1
  436. package/lib/commonjs/features/favorites.js +28 -23
  437. package/lib/commonjs/features/favorites.js.map +1 -1
  438. package/lib/commonjs/features/gate.js +27 -6
  439. package/lib/commonjs/features/gate.js.map +1 -1
  440. package/lib/commonjs/features/metadata.js +61 -11
  441. package/lib/commonjs/features/metadata.js.map +1 -1
  442. package/lib/commonjs/features/network.js +5 -1
  443. package/lib/commonjs/features/network.js.map +1 -1
  444. package/lib/commonjs/features/nowPlaying.js +28 -14
  445. package/lib/commonjs/features/nowPlaying.js.map +1 -1
  446. package/lib/commonjs/features/output.js +9 -4
  447. package/lib/commonjs/features/output.js.map +1 -1
  448. package/lib/commonjs/features/playback/controls.js +13 -6
  449. package/lib/commonjs/features/playback/controls.js.map +1 -1
  450. package/lib/commonjs/features/playback/playWhenReady.js +6 -5
  451. package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
  452. package/lib/commonjs/features/playback/playing.js +5 -3
  453. package/lib/commonjs/features/playback/playing.js.map +1 -1
  454. package/lib/commonjs/features/playback/progress.js +13 -6
  455. package/lib/commonjs/features/playback/progress.js.map +1 -1
  456. package/lib/commonjs/features/playback/rate.js +8 -1
  457. package/lib/commonjs/features/playback/rate.js.map +1 -1
  458. package/lib/commonjs/features/playback/state.js +5 -6
  459. package/lib/commonjs/features/playback/state.js.map +1 -1
  460. package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
  461. package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
  462. package/lib/commonjs/features/playback/volume.js +6 -5
  463. package/lib/commonjs/features/playback/volume.js.map +1 -1
  464. package/lib/commonjs/features/player/options.js +20 -10
  465. package/lib/commonjs/features/player/options.js.map +1 -1
  466. package/lib/commonjs/features/player/setup.js +44 -43
  467. package/lib/commonjs/features/player/setup.js.map +1 -1
  468. package/lib/commonjs/features/player/validateOptions.js +3 -4
  469. package/lib/commonjs/features/player/validateOptions.js.map +1 -1
  470. package/lib/commonjs/features/queue/activeTrack.js +14 -4
  471. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  472. package/lib/commonjs/features/queue/queue.js +56 -21
  473. package/lib/commonjs/features/queue/queue.js.map +1 -1
  474. package/lib/commonjs/features/queue/repeatMode.js +2 -1
  475. package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
  476. package/lib/commonjs/features/queue/shuffle.js +0 -1
  477. package/lib/commonjs/features/queue/shuffle.js.map +1 -1
  478. package/lib/commonjs/features/remoteControls.js +59 -35
  479. package/lib/commonjs/features/remoteControls.js.map +1 -1
  480. package/lib/commonjs/features/sleepTimer.js +23 -6
  481. package/lib/commonjs/features/sleepTimer.js.map +1 -1
  482. package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
  483. package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
  484. package/lib/commonjs/utils/LazyNativeEmitter.js +18 -10
  485. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  486. package/lib/commonjs/utils/NativeUpdatedValue.js +32 -16
  487. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  488. package/lib/commonjs/utils/getTrackIdentity.js +26 -0
  489. package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
  490. package/lib/commonjs/utils/useDebug.js +16 -3
  491. package/lib/commonjs/utils/useDebug.js.map +1 -1
  492. package/lib/commonjs/utils/useNativeUpdatedValue.js +12 -20
  493. package/lib/commonjs/utils/useNativeUpdatedValue.js.map +1 -1
  494. package/lib/commonjs/utils/useNativeValueRefreshedBy.js +38 -0
  495. package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
  496. package/lib/commonjs/web/NativeAudioBrowser.js +207 -84
  497. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  498. package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
  499. package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
  500. package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
  501. package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
  502. package/lib/commonjs/web/TrackPlayer/Player.js +256 -40
  503. package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
  504. package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
  505. package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
  506. package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
  507. package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +34 -14
  508. package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
  509. package/lib/commonjs/web/browser/BrowserManager.js +175 -100
  510. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  511. package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
  512. package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
  513. package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
  514. package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
  515. package/lib/commonjs/web/browser/SearchManager.js +18 -23
  516. package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
  517. package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
  518. package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
  519. package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
  520. package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
  521. package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
  522. package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
  523. package/lib/commonjs/web/browser/sections.js +89 -0
  524. package/lib/commonjs/web/browser/sections.js.map +1 -0
  525. package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
  526. package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
  527. package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
  528. package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
  529. package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
  530. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  531. package/lib/commonjs/web/util/BrowserPathHelper.js +60 -11
  532. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  533. package/lib/module/AudioBrowser.js +2 -4
  534. package/lib/module/AudioBrowser.js.map +1 -1
  535. package/lib/module/CLAUDE.md +57 -0
  536. package/lib/module/features/battery.js +16 -12
  537. package/lib/module/features/battery.js.map +1 -1
  538. package/lib/module/features/browser-config.js +13 -9
  539. package/lib/module/features/browser-config.js.map +1 -1
  540. package/lib/module/features/browser.js +78 -20
  541. package/lib/module/features/browser.js.map +1 -1
  542. package/lib/module/features/carConnection.js +3 -4
  543. package/lib/module/features/carConnection.js.map +1 -1
  544. package/lib/module/features/equalizer.js +9 -5
  545. package/lib/module/features/equalizer.js.map +1 -1
  546. package/lib/module/features/errors.js +35 -21
  547. package/lib/module/features/errors.js.map +1 -1
  548. package/lib/module/features/favorites.js +28 -23
  549. package/lib/module/features/favorites.js.map +1 -1
  550. package/lib/module/features/gate.js +27 -6
  551. package/lib/module/features/gate.js.map +1 -1
  552. package/lib/module/features/metadata.js +59 -11
  553. package/lib/module/features/metadata.js.map +1 -1
  554. package/lib/module/features/network.js +5 -1
  555. package/lib/module/features/network.js.map +1 -1
  556. package/lib/module/features/nowPlaying.js +28 -14
  557. package/lib/module/features/nowPlaying.js.map +1 -1
  558. package/lib/module/features/output.js +9 -4
  559. package/lib/module/features/output.js.map +1 -1
  560. package/lib/module/features/playback/controls.js +13 -6
  561. package/lib/module/features/playback/controls.js.map +1 -1
  562. package/lib/module/features/playback/playWhenReady.js +6 -5
  563. package/lib/module/features/playback/playWhenReady.js.map +1 -1
  564. package/lib/module/features/playback/playing.js +5 -3
  565. package/lib/module/features/playback/playing.js.map +1 -1
  566. package/lib/module/features/playback/progress.js +13 -6
  567. package/lib/module/features/playback/progress.js.map +1 -1
  568. package/lib/module/features/playback/rate.js +8 -1
  569. package/lib/module/features/playback/rate.js.map +1 -1
  570. package/lib/module/features/playback/state.js +5 -6
  571. package/lib/module/features/playback/state.js.map +1 -1
  572. package/lib/module/features/playback/trackPlaybackTime.js +6 -1
  573. package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
  574. package/lib/module/features/playback/volume.js +6 -5
  575. package/lib/module/features/playback/volume.js.map +1 -1
  576. package/lib/module/features/player/options.js +20 -10
  577. package/lib/module/features/player/options.js.map +1 -1
  578. package/lib/module/features/player/setup.js +44 -43
  579. package/lib/module/features/player/setup.js.map +1 -1
  580. package/lib/module/features/player/validateOptions.js +3 -4
  581. package/lib/module/features/player/validateOptions.js.map +1 -1
  582. package/lib/module/features/queue/activeTrack.js +14 -4
  583. package/lib/module/features/queue/activeTrack.js.map +1 -1
  584. package/lib/module/features/queue/queue.js +56 -21
  585. package/lib/module/features/queue/queue.js.map +1 -1
  586. package/lib/module/features/queue/repeatMode.js +2 -1
  587. package/lib/module/features/queue/repeatMode.js.map +1 -1
  588. package/lib/module/features/queue/shuffle.js +0 -1
  589. package/lib/module/features/queue/shuffle.js.map +1 -1
  590. package/lib/module/features/remoteControls.js +59 -35
  591. package/lib/module/features/remoteControls.js.map +1 -1
  592. package/lib/module/features/sleepTimer.js +24 -7
  593. package/lib/module/features/sleepTimer.js.map +1 -1
  594. package/lib/module/test-utils/reactNativeStub.js +58 -0
  595. package/lib/module/test-utils/reactNativeStub.js.map +1 -0
  596. package/lib/module/utils/LazyNativeEmitter.js +18 -10
  597. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  598. package/lib/module/utils/NativeUpdatedValue.js +32 -16
  599. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  600. package/lib/module/utils/getTrackIdentity.js +22 -0
  601. package/lib/module/utils/getTrackIdentity.js.map +1 -0
  602. package/lib/module/utils/useDebug.js +16 -3
  603. package/lib/module/utils/useDebug.js.map +1 -1
  604. package/lib/module/utils/useNativeUpdatedValue.js +13 -21
  605. package/lib/module/utils/useNativeUpdatedValue.js.map +1 -1
  606. package/lib/module/utils/useNativeValueRefreshedBy.js +34 -0
  607. package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
  608. package/lib/module/web/NativeAudioBrowser.js +207 -84
  609. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  610. package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
  611. package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
  612. package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
  613. package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
  614. package/lib/module/web/TrackPlayer/Player.js +256 -40
  615. package/lib/module/web/TrackPlayer/Player.js.map +1 -1
  616. package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
  617. package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
  618. package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
  619. package/lib/module/web/TrackPlayer/QueuePlayer.js +34 -14
  620. package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
  621. package/lib/module/web/browser/BrowserManager.js +175 -100
  622. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  623. package/lib/module/web/browser/FavoriteManager.js +31 -21
  624. package/lib/module/web/browser/FavoriteManager.js.map +1 -1
  625. package/lib/module/web/browser/NavigationErrorManager.js +3 -1
  626. package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
  627. package/lib/module/web/browser/SearchManager.js +18 -23
  628. package/lib/module/web/browser/SearchManager.js.map +1 -1
  629. package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
  630. package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
  631. package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
  632. package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
  633. package/lib/module/web/browser/parseSearchResponse.js +3 -4
  634. package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
  635. package/lib/module/web/browser/sections.js +83 -0
  636. package/lib/module/web/browser/sections.js.map +1 -0
  637. package/lib/module/web/http/RequestConfigBuilder.js +110 -27
  638. package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
  639. package/lib/module/web/http/followMediaRedirect.js +215 -0
  640. package/lib/module/web/http/followMediaRedirect.js.map +1 -0
  641. package/lib/module/web/player/NowPlayingManager.js +4 -3
  642. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  643. package/lib/module/web/util/BrowserPathHelper.js +60 -11
  644. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  645. package/lib/typescript/package.json +1 -0
  646. package/lib/typescript/src/AudioBrowser.d.ts +1 -0
  647. package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
  648. package/lib/typescript/src/features/battery.d.ts +17 -12
  649. package/lib/typescript/src/features/battery.d.ts.map +1 -1
  650. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  651. package/lib/typescript/src/features/browser.d.ts +67 -19
  652. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  653. package/lib/typescript/src/features/carConnection.d.ts +3 -4
  654. package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
  655. package/lib/typescript/src/features/equalizer.d.ts +9 -5
  656. package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
  657. package/lib/typescript/src/features/errors.d.ts +37 -22
  658. package/lib/typescript/src/features/errors.d.ts.map +1 -1
  659. package/lib/typescript/src/features/favorites.d.ts +28 -23
  660. package/lib/typescript/src/features/favorites.d.ts.map +1 -1
  661. package/lib/typescript/src/features/gate.d.ts +29 -8
  662. package/lib/typescript/src/features/gate.d.ts.map +1 -1
  663. package/lib/typescript/src/features/metadata.d.ts +65 -14
  664. package/lib/typescript/src/features/metadata.d.ts.map +1 -1
  665. package/lib/typescript/src/features/network.d.ts +5 -1
  666. package/lib/typescript/src/features/network.d.ts.map +1 -1
  667. package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
  668. package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
  669. package/lib/typescript/src/features/output.d.ts +9 -4
  670. package/lib/typescript/src/features/output.d.ts.map +1 -1
  671. package/lib/typescript/src/features/playback/controls.d.ts +13 -6
  672. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  673. package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
  674. package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
  675. package/lib/typescript/src/features/playback/playing.d.ts +16 -3
  676. package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
  677. package/lib/typescript/src/features/playback/progress.d.ts +11 -5
  678. package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
  679. package/lib/typescript/src/features/playback/rate.d.ts +8 -1
  680. package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
  681. package/lib/typescript/src/features/playback/state.d.ts +10 -6
  682. package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
  683. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
  684. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  685. package/lib/typescript/src/features/playback/volume.d.ts +6 -5
  686. package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
  687. package/lib/typescript/src/features/player/options.d.ts +73 -56
  688. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  689. package/lib/typescript/src/features/player/setup.d.ts +129 -73
  690. package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
  691. package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -2
  692. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  693. package/lib/typescript/src/features/queue/queue.d.ts +50 -19
  694. package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
  695. package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
  696. package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
  697. package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
  698. package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
  699. package/lib/typescript/src/features/remoteControls.d.ts +58 -25
  700. package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
  701. package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
  702. package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
  703. package/lib/typescript/src/specs/audio-browser.nitro.d.ts +3 -4
  704. package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
  705. package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
  706. package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
  707. package/lib/typescript/src/types/browser-native.d.ts +3 -2
  708. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  709. package/lib/typescript/src/types/browser-nodes.d.ts +401 -143
  710. package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
  711. package/lib/typescript/src/types/browser.d.ts +248 -173
  712. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  713. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +13 -17
  714. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  715. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +17 -20
  716. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  717. package/lib/typescript/src/utils/getTrackIdentity.d.ts +20 -0
  718. package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
  719. package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
  720. package/lib/typescript/src/utils/resolveAssetSource.d.ts.map +1 -1
  721. package/lib/typescript/src/utils/useDebug.d.ts +16 -3
  722. package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
  723. package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts +4 -4
  724. package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts.map +1 -1
  725. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +20 -0
  726. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
  727. package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
  728. package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
  729. package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
  730. package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
  731. package/nitrogen/generated/android/c++/JAndroidOptions.hpp +2 -2
  732. package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
  733. package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
  734. package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
  735. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
  736. package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
  737. package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
  738. package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
  739. package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
  740. package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
  741. package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
  742. package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
  743. package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
  744. package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
  745. package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
  746. package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
  747. package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
  748. package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
  749. package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
  750. package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
  751. package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
  752. package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
  753. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
  754. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
  755. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
  756. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
  757. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
  758. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
  759. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
  760. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
  761. 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
  762. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
  763. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
  764. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
  765. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
  766. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
  767. 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
  768. package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
  769. package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
  770. package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
  771. package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
  772. package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
  773. package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
  774. package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
  775. package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
  776. package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +4 -7
  777. package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
  778. package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
  779. package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
  780. package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
  781. package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
  782. package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
  783. package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
  784. package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
  785. package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
  786. package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
  787. package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
  788. package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
  789. package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
  790. package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
  791. package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
  792. package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
  793. package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
  794. package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
  795. package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
  796. package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
  797. package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
  798. package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
  799. package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
  800. package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
  801. package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
  802. package/nitrogen/generated/android/c++/JGate.hpp +2 -2
  803. package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
  804. package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
  805. package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
  806. package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
  807. package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
  808. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +77 -44
  809. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +4 -3
  810. package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
  811. package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
  812. package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
  813. package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
  814. package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
  815. package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
  816. package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
  817. package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
  818. package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
  819. package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
  820. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
  821. package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
  822. package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
  823. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
  824. package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
  825. package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
  826. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
  827. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +21 -12
  828. package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +4 -7
  829. package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
  830. package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
  831. package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
  832. package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
  833. package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +2 -2
  834. package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
  835. package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
  836. package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
  837. package/nitrogen/generated/android/c++/JOptions.hpp +4 -7
  838. package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
  839. package/nitrogen/generated/android/c++/JOutputType.hpp +8 -2
  840. package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
  841. package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
  842. package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
  843. package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
  844. package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
  845. package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
  846. package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
  847. package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
  848. package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
  849. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
  850. package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
  851. package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
  852. package/nitrogen/generated/android/c++/JRemoteButton.hpp +2 -2
  853. package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +10 -10
  854. package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
  855. package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
  856. package/nitrogen/generated/android/c++/JRemoteOutputsOptions.hpp +66 -0
  857. package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
  858. package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
  859. package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
  860. package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
  861. package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
  862. package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
  863. package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
  864. package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
  865. package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
  866. package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
  867. package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
  868. package/nitrogen/generated/android/c++/JSection.hpp +116 -0
  869. package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
  870. package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
  871. package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
  872. package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
  873. package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
  874. package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
  875. package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
  876. package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
  877. package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +25 -15
  878. package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
  879. package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
  880. package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
  881. package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
  882. package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
  883. package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
  884. package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
  885. package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +3 -3
  886. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
  887. package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
  888. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
  889. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +17 -0
  890. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
  891. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
  892. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
  893. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
  894. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
  895. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
  896. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
  897. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
  898. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
  899. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
  900. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
  901. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
  902. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
  903. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
  904. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
  905. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
  906. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
  907. 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
  908. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
  909. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
  910. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
  911. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
  912. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
  913. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
  914. 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
  915. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
  916. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
  917. 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
  918. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
  919. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
  920. 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
  921. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
  922. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
  923. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
  924. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
  925. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
  926. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
  927. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
  928. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
  929. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
  930. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
  931. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
  932. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
  933. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
  934. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
  935. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
  936. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
  937. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
  938. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
  939. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
  940. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
  941. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
  942. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
  943. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
  944. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
  945. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
  946. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
  947. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
  948. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
  949. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
  950. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
  951. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
  952. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
  953. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
  954. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
  955. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
  956. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
  957. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
  958. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
  959. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +7 -1
  960. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
  961. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
  962. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
  963. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
  964. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
  965. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
  966. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
  967. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
  968. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
  969. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
  970. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
  971. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
  972. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +39 -5
  973. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
  974. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
  975. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
  976. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
  977. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +17 -0
  978. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
  979. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
  980. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
  981. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
  982. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
  983. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +3 -1
  984. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
  985. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
  986. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
  987. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
  988. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
  989. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
  990. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
  991. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
  992. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
  993. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
  994. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +17 -0
  995. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
  996. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
  997. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteOutputsOptions.kt +61 -0
  998. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
  999. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
  1000. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
  1001. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
  1002. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
  1003. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
  1004. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
  1005. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
  1006. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
  1007. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
  1008. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
  1009. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
  1010. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
  1011. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
  1012. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
  1013. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
  1014. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
  1015. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +25 -3
  1016. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
  1017. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
  1018. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
  1019. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
  1020. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
  1021. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
  1022. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
  1023. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout.kt +16 -7
  1024. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
  1025. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
  1026. package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
  1027. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
  1028. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +800 -644
  1029. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +31 -10
  1030. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +41 -12
  1031. package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
  1032. package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
  1033. package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
  1034. package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
  1035. package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
  1036. package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
  1037. package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
  1038. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +2 -1
  1039. package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +20 -2
  1040. package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
  1041. package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
  1042. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
  1043. package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +12 -1
  1044. package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
  1045. package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
  1046. package/nitrogen/generated/ios/swift/OutputType.swift +8 -0
  1047. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
  1048. package/nitrogen/generated/ios/swift/RemoteOutputsOptions.swift +78 -0
  1049. package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
  1050. package/nitrogen/generated/ios/swift/Section.swift +82 -0
  1051. package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
  1052. package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
  1053. package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
  1054. package/nitrogen/generated/ios/swift/Track.swift +28 -63
  1055. package/nitrogen/generated/ios/swift/TrackLoadEvent.swift +20 -2
  1056. package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
  1057. package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
  1058. package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
  1059. package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
  1060. package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +12 -0
  1061. package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
  1062. package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
  1063. package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
  1064. package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
  1065. package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
  1066. package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
  1067. package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
  1068. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +2 -1
  1069. package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +2 -1
  1070. package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
  1071. package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
  1072. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
  1073. package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +9 -2
  1074. package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
  1075. package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
  1076. package/nitrogen/generated/shared/c++/OutputType.hpp +9 -1
  1077. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
  1078. package/nitrogen/generated/shared/c++/RemoteOutputsOptions.hpp +92 -0
  1079. package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
  1080. package/nitrogen/generated/shared/c++/Section.hpp +102 -0
  1081. package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
  1082. package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
  1083. package/nitrogen/generated/shared/c++/Track.hpp +18 -30
  1084. package/nitrogen/generated/shared/c++/TrackLoadEvent.hpp +7 -2
  1085. package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
  1086. package/package.json +27 -13
  1087. package/src/AudioBrowser.ts +2 -4
  1088. package/src/CLAUDE.md +57 -0
  1089. package/src/docs-floors.test.ts +71 -0
  1090. package/src/features/battery.test.ts +79 -0
  1091. package/src/features/battery.ts +17 -13
  1092. package/src/features/browser-config.test.ts +21 -6
  1093. package/src/features/browser-config.ts +13 -9
  1094. package/src/features/browser.test.ts +1 -1
  1095. package/src/features/browser.ts +69 -20
  1096. package/src/features/carConnection.ts +3 -4
  1097. package/src/features/equalizer.ts +9 -5
  1098. package/src/features/errors.ts +37 -22
  1099. package/src/features/favorites.ts +28 -23
  1100. package/src/features/gate.ts +29 -8
  1101. package/src/features/hook-wiring.test.ts +302 -0
  1102. package/src/features/metadata.ts +80 -14
  1103. package/src/features/network.ts +5 -1
  1104. package/src/features/nowPlaying.ts +28 -14
  1105. package/src/features/output.ts +9 -4
  1106. package/src/features/playback/controls.ts +13 -6
  1107. package/src/features/playback/playWhenReady.ts +6 -5
  1108. package/src/features/playback/playing.ts +16 -3
  1109. package/src/features/playback/progress.test.ts +169 -0
  1110. package/src/features/playback/progress.ts +13 -6
  1111. package/src/features/playback/rate.ts +8 -1
  1112. package/src/features/playback/state.ts +10 -6
  1113. package/src/features/playback/trackPlaybackTime.test.ts +1 -5
  1114. package/src/features/playback/trackPlaybackTime.ts +9 -2
  1115. package/src/features/playback/volume.ts +6 -5
  1116. package/src/features/player/options.ts +81 -62
  1117. package/src/features/player/setup.test.ts +12 -3
  1118. package/src/features/player/setup.ts +141 -76
  1119. package/src/features/player/validateOptions.ts +3 -4
  1120. package/src/features/queue/activeTrack.ts +14 -4
  1121. package/src/features/queue/queue.ts +56 -21
  1122. package/src/features/queue/repeatMode.ts +1 -1
  1123. package/src/features/queue/shuffle.ts +0 -1
  1124. package/src/features/remoteControls.ts +59 -35
  1125. package/src/features/sleepTimer.test.ts +171 -0
  1126. package/src/features/sleepTimer.ts +24 -8
  1127. package/src/nitro-stub-drift.test.ts +277 -0
  1128. package/src/public-surface.test.ts +48 -24
  1129. package/src/specs/audio-browser.nitro.ts +15 -8
  1130. package/src/style-resolution.test.ts +210 -0
  1131. package/src/test-utils/reactNativeStub.ts +60 -0
  1132. package/src/types/browser-native.ts +7 -3
  1133. package/src/types/browser-nodes.ts +417 -151
  1134. package/src/types/browser.ts +254 -177
  1135. package/src/utils/LazyNativeEmitter.ts +17 -10
  1136. package/src/utils/NativeUpdatedValue.ts +30 -16
  1137. package/src/utils/getTrackIdentity.ts +22 -0
  1138. package/src/utils/useDebug.test.ts +182 -0
  1139. package/src/utils/useDebug.ts +16 -3
  1140. package/src/utils/useNativeUpdatedValue.test.ts +111 -0
  1141. package/src/utils/useNativeUpdatedValue.ts +13 -17
  1142. package/src/utils/useNativeValueRefreshedBy.test.ts +68 -0
  1143. package/src/utils/useNativeValueRefreshedBy.ts +45 -0
  1144. package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
  1145. package/src/web/NativeAudioBrowser.ts +247 -92
  1146. package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
  1147. package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
  1148. package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
  1149. package/src/web/TrackPlayer/Player.dispatch.test.ts +50 -5
  1150. package/src/web/TrackPlayer/Player.load.test.ts +137 -1
  1151. package/src/web/TrackPlayer/Player.ts +286 -38
  1152. package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
  1153. package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
  1154. package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
  1155. package/src/web/TrackPlayer/QueueManager.ts +14 -0
  1156. package/src/web/TrackPlayer/QueuePlayer.ts +34 -16
  1157. package/src/web/__tests__/lifecycle.test.ts +345 -0
  1158. package/src/web/__tests__/lifecycleHarness.ts +351 -0
  1159. package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
  1160. package/src/web/__tests__/loadSupersession.test.ts +175 -0
  1161. package/src/web/__tests__/retry.test.ts +169 -0
  1162. package/src/web/browser/BrowserManager.ts +209 -111
  1163. package/src/web/browser/FavoriteManager.test.ts +84 -0
  1164. package/src/web/browser/FavoriteManager.ts +28 -23
  1165. package/src/web/browser/NavigationErrorManager.ts +3 -1
  1166. package/src/web/browser/SearchManager.test.ts +75 -0
  1167. package/src/web/browser/SearchManager.ts +25 -28
  1168. package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
  1169. package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
  1170. package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
  1171. package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
  1172. package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
  1173. package/src/web/browser/assertBrowsePageShape.ts +5 -3
  1174. package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
  1175. package/src/web/browser/classifyTrackNavigation.ts +9 -9
  1176. package/src/web/browser/parseSearchResponse.test.ts +8 -2
  1177. package/src/web/browser/parseSearchResponse.ts +3 -4
  1178. package/src/web/browser/sections.test.ts +91 -0
  1179. package/src/web/browser/sections.ts +72 -0
  1180. package/src/web/http/RequestConfigBuilder.test.ts +241 -1
  1181. package/src/web/http/RequestConfigBuilder.ts +140 -33
  1182. package/src/web/http/followMediaRedirect.test.ts +289 -0
  1183. package/src/web/http/followMediaRedirect.ts +253 -0
  1184. package/src/web/player/NowPlayingManager.ts +4 -3
  1185. package/src/web/util/BrowserPathHelper.test.ts +68 -0
  1186. package/src/web/util/BrowserPathHelper.ts +68 -13
  1187. package/website/guide/android-auto.md +126 -0
  1188. package/website/guide/android-certificates.md +488 -0
  1189. package/website/guide/artwork.md +300 -0
  1190. package/website/guide/audio-output.md +382 -0
  1191. package/website/guide/automotive.md +91 -0
  1192. package/website/guide/basic-usage.md +154 -0
  1193. package/website/guide/battery.md +142 -0
  1194. package/website/guide/browser.md +674 -0
  1195. package/website/guide/carplay.md +733 -0
  1196. package/website/guide/configuration.md +215 -0
  1197. package/website/guide/equalizer.md +235 -0
  1198. package/website/guide/errors.md +359 -0
  1199. package/website/guide/favorites.md +164 -0
  1200. package/website/guide/gate.md +157 -0
  1201. package/website/guide/getting-started.md +99 -0
  1202. package/website/guide/hooks.md +247 -0
  1203. package/website/guide/live-streams.md +189 -0
  1204. package/website/guide/metadata.md +289 -0
  1205. package/website/guide/migrating-from-track-player.md +289 -0
  1206. package/website/guide/native-callback-fetch.md +137 -0
  1207. package/website/guide/network.md +103 -0
  1208. package/website/guide/now-playing.md +203 -0
  1209. package/website/guide/playback.md +405 -0
  1210. package/website/guide/queue.md +334 -0
  1211. package/website/guide/remote-controls.md +314 -0
  1212. package/website/guide/search.md +270 -0
  1213. package/website/guide/sleep-timer.md +289 -0
  1214. package/website/guide/track.md +271 -0
  1215. package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +0 -50
  1216. package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -68
  1217. package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +0 -40
  1218. package/ios/Bridge.h +0 -8
  1219. package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
  1220. package/ios/Browser/MediaResolveComposer.swift +0 -114
  1221. package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
  1222. package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
  1223. package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
  1224. package/ios/Model/MediaURL.swift +0 -67
  1225. package/ios/Model/SourceType.swift +0 -6
  1226. package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
  1227. package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
  1228. package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
  1229. package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
  1230. package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
  1231. package/ios/Observer/PlayerStateObserver.swift +0 -50
  1232. package/ios/Observer/PlayerTimeObserver.swift +0 -55
  1233. package/ios/Option/PitchAlgorithms.swift +0 -17
  1234. package/ios/Option/TimeEventFrequency.swift +0 -18
  1235. package/ios/Player/EndOfTrackJudgement.swift +0 -32
  1236. package/ios/Player/LoadSeekCoordinator.swift +0 -99
  1237. package/ios/Player/MediaIntentCriteria.swift +0 -139
  1238. package/ios/Player/MediaLoaderDelegate.swift +0 -11
  1239. package/ios/Player/PlaybackCoordinator.swift +0 -754
  1240. package/ios/Player/PlaybackEffectHandler.swift +0 -54
  1241. package/ios/Player/PlaybackErrorHandler.swift +0 -175
  1242. package/ios/Player/PlaybackStateStore.swift +0 -27
  1243. package/ios/Player/PlayingStateManager.swift +0 -33
  1244. package/ios/Player/RetryManager.swift +0 -323
  1245. package/ios/Player/SeekCompletionHandler.swift +0 -3
  1246. package/ios/Player/SleepTimerHandling.swift +0 -15
  1247. package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
  1248. package/ios/Tests/EndOfTrackJudgementTests.swift +0 -35
  1249. package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -327
  1250. package/ios/Tests/MediaResolveTests.swift +0 -126
  1251. package/ios/Tests/OnceValueTests.swift +0 -79
  1252. package/ios/Tests/PlaybackCoordinatorTests.swift +0 -1260
  1253. package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
  1254. package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
  1255. package/ios/Tests/PlayingStateManagerTests.swift +0 -57
  1256. package/ios/Tests/RemoteCommandTests.swift +0 -67
  1257. package/ios/Tests/RetryManagerTests.swift +0 -89
  1258. package/ios/TrackPlayer.swift +0 -1014
  1259. package/ios/TrackPlayerCallbacks.swift +0 -53
  1260. package/ios/Util/MetadataAdapter.swift +0 -131
  1261. package/ios/Util/OnceValue.swift +0 -104
  1262. package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
  1263. package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
  1264. package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
  1265. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
  1266. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
  1267. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
  1268. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
  1269. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
  1270. package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
  1271. package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
  1272. package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
  1273. package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
  1274. package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
  1275. package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
@@ -1,6 +1,8 @@
1
1
  package com.audiobrowser.player
2
2
 
3
3
  import android.os.Bundle
4
+ import androidx.core.content.ContextCompat
5
+ import androidx.media3.common.C
4
6
  import androidx.media3.common.MediaItem
5
7
  import androidx.media3.common.MediaMetadata
6
8
  import androidx.media3.common.Rating
@@ -11,22 +13,35 @@ import androidx.media3.session.MediaSession
11
13
  import androidx.media3.session.SessionCommand
12
14
  import androidx.media3.session.SessionError
13
15
  import androidx.media3.session.SessionResult
16
+ import com.audiobrowser.browser.BrowserManager
14
17
  import com.audiobrowser.browser.handleTrackLoad
18
+ import com.audiobrowser.browser.normalizedSections
19
+ import com.audiobrowser.browser.styleResolvedSections
20
+ import com.audiobrowser.browser.untitledSection
21
+ import com.audiobrowser.extension.indexOfTappedTrack
15
22
  import com.audiobrowser.extension.toTrack
23
+ import com.audiobrowser.navigationErrorFor
24
+ import com.audiobrowser.util.Automotive
16
25
  import com.audiobrowser.util.BrowserPathHelper
17
26
  import com.audiobrowser.util.RatingFavorites
18
27
  import com.audiobrowser.util.TrackFactory
28
+ import com.audiobrowser.util.isAutomotive
19
29
  import com.google.common.collect.ImmutableList
30
+ import com.google.common.util.concurrent.FutureCallback
20
31
  import com.google.common.util.concurrent.Futures
21
32
  import com.google.common.util.concurrent.ListenableFuture
33
+ import com.margelo.nitro.audiobrowser.FormattedNavigationError
22
34
  import com.margelo.nitro.audiobrowser.Gate
23
35
  import com.margelo.nitro.audiobrowser.GateEvent
24
36
  import com.margelo.nitro.audiobrowser.GateReason
25
37
  import com.margelo.nitro.audiobrowser.MediaReference
26
38
  import com.margelo.nitro.audiobrowser.NativeGateRequest
39
+ import com.margelo.nitro.audiobrowser.NavigationError
40
+ import com.margelo.nitro.audiobrowser.NavigationErrorType
27
41
  import com.margelo.nitro.audiobrowser.PlayerCapabilities
28
42
  import com.margelo.nitro.audiobrowser.RemoteButtonLayout
29
43
  import com.margelo.nitro.audiobrowser.SearchParams
44
+ import com.margelo.nitro.audiobrowser.Section
30
45
  import com.margelo.nitro.audiobrowser.Track
31
46
  import kotlinx.coroutines.CancellationException
32
47
  import kotlinx.coroutines.CoroutineScope
@@ -40,38 +55,39 @@ import kotlinx.coroutines.withContext
40
55
  import timber.log.Timber
41
56
 
42
57
  /**
43
- * MediaLibrarySession callback that handles all media session interactions. All logic is handled
44
- * directly by the AudioBrowser.
58
+ * Everything the MediaLibrarySession serves except transport, which reaches the player through
59
+ * [InterceptingPlayer]; Assistant's play-from-search arrives as an intent in the service. Callbacks
60
+ * answering through [scope] run on IO, so anything touching ExoPlayer hops to [Dispatchers.Main];
61
+ * the rest answer on the Media3 application thread.
45
62
  */
46
63
  class MediaSessionCallback(private val player: Player) :
47
64
  MediaLibraryService.MediaLibrarySession.Callback {
48
- internal val commandManager = MediaSessionCommandManager()
65
+ internal val commandManager = MediaSessionCommandManager(player.context.isAutomotive)
49
66
  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
50
67
 
51
- // Track which controllers are subscribed to which media IDs.
52
- // Mutated on the Media3 application thread (onSubscribe/onUnsubscribe) but read from other
53
- // threads (network observer, JS-triggered notifies) — guard all access with synchronized(this).
68
+ // Written on the Media3 application thread, read from the network observer and JS-triggered
69
+ // notifies: every access goes through synchronized(this).
54
70
  private val parentIdSubscriptions =
55
71
  mutableMapOf<String, MutableSet<MediaSession.ControllerInfo>>()
72
+ private val failedSearch = FailedSearchSlot()
73
+ private val offlineSearches = OfflineSearchRegistry()
56
74
  private var mediaLibrarySession: MediaLibraryService.MediaLibrarySession? = null
57
75
 
58
- /**
59
- * Recommended artwork size in pixels from the connected media browser (e.g., Android Auto).
60
- * Updated when onGetLibraryRoot is called with EXTRAS_KEY_MEDIA_ART_SIZE_PIXELS hint.
61
- */
76
+ /** The art size the last browser hinted in onGetLibraryRoot, or null before any hint. */
62
77
  @Volatile
63
78
  var artworkSizeHintPixels: Int? = null
64
79
  private set
65
80
 
66
81
  init {
67
- // Observe network state changes and notify subscribers
68
- player.networkMonitor.observeOnline(scope) { _ -> notifySubscribedChildrenChanged() }
82
+ player.networkMonitor.observeOnline(scope) { online ->
83
+ notifySubscribedChildrenChanged()
84
+ // A browse level is re-queried through its subscription; a search has none, so its offline
85
+ // tile leaves the screen only when the query runs again.
86
+ if (online) scope.launch { reannounceOfflineSearches() }
87
+ }
69
88
  }
70
89
 
71
- /**
72
- * Apply pagination to a list of items. If pageSize is 0 or MAX_VALUE (Android Auto default),
73
- * returns the full list.
74
- */
90
+ /** Media3's legacy browse bridge asks for a whole list with pageSize [Int.MAX_VALUE]. */
75
91
  private fun <T> List<T>.paginate(page: Int, pageSize: Int): List<T> {
76
92
  return if (pageSize in 1 until Int.MAX_VALUE) {
77
93
  this.drop(page * pageSize).take(pageSize)
@@ -80,50 +96,7 @@ class MediaSessionCallback(private val player: Player) :
80
96
  }
81
97
  }
82
98
 
83
- /** Creates an offline error MediaItem. */
84
- private fun createOfflineMediaItem(): MediaItem =
85
- createErrorMediaItem(
86
- mediaId = BrowserPathHelper.OFFLINE_PATH,
87
- title = player.context.getString(com.audiobrowser.R.string.audio_browser_offline_error),
88
- subtitle =
89
- player.context.getString(com.audiobrowser.R.string.audio_browser_offline_error_subtitle),
90
- )
91
-
92
- /**
93
- * Builds a non-browsable, non-playable [MediaItem] used to surface an error inside an Android
94
- * Auto / AAOS browse list. Rendered as a greyed-out, non-interactive tile, which is the only
95
- * side-effect-free way to communicate a browse failure to legacy controllers (Media3 drops
96
- * [LibraryResult.ofError] on the legacy browse bridge, leaving an empty "No items" screen).
97
- */
98
- private fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
99
- MediaItem.Builder()
100
- .setMediaId(mediaId)
101
- .setMediaMetadata(
102
- MediaMetadata.Builder()
103
- .setTitle(title)
104
- .setSubtitle(subtitle)
105
- // Non-browsable, non-playable. Android Auto ignores these flags and still drills into a
106
- // tapped tile, but onGetChildren returns an empty list for the sentinel paths so it's a
107
- // harmless "No Items" dead-end rather than an endless stack of error pages.
108
- .setIsBrowsable(false)
109
- .setIsPlayable(false)
110
- .build()
111
- )
112
- .build()
113
-
114
- /**
115
- * Builds the gate tile from a per-request chrome: while a gate is active, tabs stay visible but a
116
- * gated browse/search level serves this single tile (see the gate checks in [onGetChildren] /
117
- * [onGetSearchResult]). Same shape as the error tiles — non-browsable, non-playable — and
118
- * deliberately NOT accompanied by a SessionError: a gate is deliberate app state, not a failure.
119
- * The message renders as the tile's subtitle (newlines collapse to spaces — list rows are
120
- * single-line).
121
- */
122
- /**
123
- * Wraps a raw external-search query string into the structured [SearchParams] the gate request
124
- * carries. The car search surfaces only give a free-text query, so the other fields stay null —
125
- * mirrors BrowserManager's query→SearchParams construction.
126
- */
99
+ // Car search surfaces give free text only. Mirrors BrowserManager's query→SearchParams.
127
100
  private fun searchParams(query: String): SearchParams =
128
101
  SearchParams(
129
102
  mode = null,
@@ -138,23 +111,8 @@ class MediaSessionCallback(private val player: Player) :
138
111
 
139
112
  private fun createGateMediaItem(gate: Gate): MediaItem =
140
113
  createErrorMediaItem(
141
- mediaId = BrowserPathHelper.GATE_PATH,
142
- title = gate.title,
143
- subtitle = gate.message?.replace('\n', ' ') ?: "",
144
- )
145
-
146
- /**
147
- * Builds a generic "something went wrong" error tile for a browse failure. The true offline case
148
- * is handled separately by the [networkMonitor] guard in [onGetChildren]; anything reaching the
149
- * catch block is an online-but-failed request (e.g. server down, bad status), so it must NOT be
150
- * labelled "no internet connection".
151
- */
152
- private fun createBrowseErrorMediaItem(): MediaItem =
153
- createErrorMediaItem(
154
- mediaId = BrowserPathHelper.ERROR_PATH,
155
- title = player.context.getString(com.audiobrowser.R.string.audio_browser_browse_error),
156
- subtitle =
157
- player.context.getString(com.audiobrowser.R.string.audio_browser_browse_error_subtitle),
114
+ BrowserPathHelper.GATE_PATH,
115
+ FormattedNavigationError(gate.title, gate.message),
158
116
  )
159
117
 
160
118
  fun updateMediaSession(
@@ -165,7 +123,6 @@ class MediaSessionCallback(private val player: Player) :
165
123
  forwardJumpInterval: Double,
166
124
  backwardJumpInterval: Double,
167
125
  ) {
168
- // Store as MediaLibrarySession for notifyChildrenChanged support
169
126
  this.mediaLibrarySession = mediaSession as? MediaLibraryService.MediaLibrarySession
170
127
  commandManager.updateMediaSession(
171
128
  mediaSession,
@@ -185,18 +142,34 @@ class MediaSessionCallback(private val player: Player) :
185
142
  return commandManager.buildConnectionResult(session)
186
143
  }
187
144
 
145
+ override fun onDisconnected(session: MediaSession, controller: MediaSession.ControllerInfo) {
146
+ Timber.Forest.d("MediaSession disconnect: ${controller.packageName}")
147
+ // Android Auto normally leaves without unsubscribing; the controller would be notified, and
148
+ // held, forever.
149
+ offlineSearches.forget(controller)
150
+ synchronized(this) {
151
+ parentIdSubscriptions.values.forEach { it.remove(controller) }
152
+ parentIdSubscriptions.entries.removeAll { (_, browsers) -> browsers.isEmpty() }
153
+ }
154
+ super.onDisconnected(session, controller)
155
+ }
156
+
188
157
  override fun onCustomCommand(
189
158
  session: MediaSession,
190
159
  controller: MediaSession.ControllerInfo,
191
160
  command: SessionCommand,
192
161
  args: Bundle,
193
162
  ): ListenableFuture<SessionResult> {
194
- // Handle favorite button tap
163
+ // A success makes the controller flip its heart optimistically, so a no-op (no current track)
164
+ // reports INVALID_STATE rather than success-then-revert.
195
165
  if (command.customAction == MediaSessionCommandManager.CUSTOM_ACTION_FAVORITE) {
196
- val currentFavorited = player.currentTrack?.favorited ?: false
197
- Timber.d("Favorite button tapped - toggling from $currentFavorited to ${!currentFavorited}")
198
- player.setActiveTrackFavorited(!currentFavorited)
199
- return Futures.immediateFuture(SessionResult(SessionResult.RESULT_SUCCESS))
166
+ val applied = player.toggleActiveTrackFavorited()
167
+ Timber.d("Favorite button tapped - toggle applied=$applied")
168
+ return Futures.immediateFuture(
169
+ SessionResult(
170
+ if (applied) SessionResult.RESULT_SUCCESS else SessionResult.RESULT_ERROR_INVALID_STATE
171
+ )
172
+ )
200
173
  }
201
174
 
202
175
  if (commandManager.handleCustomCommand(command, player)) {
@@ -210,26 +183,41 @@ class MediaSessionCallback(private val player: Player) :
210
183
  controller: MediaSession.ControllerInfo,
211
184
  rating: Rating,
212
185
  ): ListenableFuture<SessionResult> {
213
- // A heart rating from a controller (e.g. Google Assistant "I like this") toggles the
214
- // now-playing favorite. setActiveTrackFavorited fires onFavoriteChanged so the consumer
215
- // persists it — the same path as the notification / CarPlay heart button.
216
- RatingFavorites.favoritedFor(rating)?.let { player.setActiveTrackFavorited(it) }
186
+ // A heart rating sets the now-playing favorite, as the favorite button does; INVALID_STATE when
187
+ // there is no current track.
188
+ RatingFavorites.favoritedFor(rating)?.let { favorited ->
189
+ val applied = player.setActiveTrackFavorited(favorited)
190
+ return Futures.immediateFuture(
191
+ SessionResult(
192
+ if (applied) SessionResult.RESULT_SUCCESS else SessionResult.RESULT_ERROR_INVALID_STATE
193
+ )
194
+ )
195
+ }
217
196
  return super.onSetRating(session, controller, rating)
218
197
  }
219
198
 
199
+ /**
200
+ * A legacy controller's setRating names the current item; a Media3 controller's can name any
201
+ * item. Only the current one can be rated.
202
+ */
203
+ override fun onSetRating(
204
+ session: MediaSession,
205
+ controller: MediaSession.ControllerInfo,
206
+ mediaId: String,
207
+ rating: Rating,
208
+ ): ListenableFuture<SessionResult> =
209
+ if (mediaId == session.player.currentMediaItem?.mediaId) {
210
+ onSetRating(session, controller, rating)
211
+ } else {
212
+ super.onSetRating(session, controller, mediaId, rating)
213
+ }
214
+
220
215
  @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
221
216
  override fun onGetLibraryRoot(
222
217
  session: MediaLibraryService.MediaLibrarySession,
223
218
  browser: MediaSession.ControllerInfo,
224
219
  params: MediaLibraryService.LibraryParams?,
225
220
  ): ListenableFuture<LibraryResult<MediaItem>> {
226
- // Extract artwork size hint from root hints (e.g., from Android Auto)
227
- // TODO: Also consider these other root hints in the future:
228
- // - KEY_ROOT_HINT_MEDIA_HOST_VERSION
229
- // - KEY_ROOT_HINT_MEDIA_SESSION_API
230
- // - BROWSER_ROOT_HINTS_KEY_CUSTOM_BROWSER_ACTION_LIMIT
231
- // - BROWSER_ROOT_HINTS_KEY_ROOT_CHILDREN_LIMIT
232
- // - KEY_ROOT_HINT_MAX_QUEUE_ITEMS_WHILE_RESTRICTED
233
221
  params?.extras?.getInt(MediaConstants.EXTRAS_KEY_MEDIA_ART_SIZE_PIXELS, 0)?.let { size ->
234
222
  if (size > 0) {
235
223
  artworkSizeHintPixels = size
@@ -238,13 +226,8 @@ class MediaSessionCallback(private val player: Player) :
238
226
  }
239
227
 
240
228
  if (params?.isRecent == true) {
241
- // TODO: support recent queries through something like onRecent and return a MediaItem with
242
- // .setMediaId("__RECENT__") here - when onRecent is not configured we can keep returning an
243
- // error here:
244
-
245
- // The service currently does not support playback resumption. Tell System UI by returning
246
- // an error of type 'RESULT_ERROR_NOT_SUPPORTED' for a `params.isRecent` request. See
247
- // https://github.com/androidx/media/issues/355
229
+ // Media3 answers System UI's EXTRA_RECENT root itself, through onPlaybackResumption, so this
230
+ // is another browser asking; there is no browsable recents tree.
248
231
  return Futures.immediateFuture(LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED))
249
232
  }
250
233
 
@@ -271,120 +254,131 @@ class MediaSessionCallback(private val player: Player) :
271
254
  params: MediaLibraryService.LibraryParams?,
272
255
  ): ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> {
273
256
  Timber.d(
274
- "onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize, isSearchPath: ${BrowserPathHelper.isSpecialPath(parentId)} }"
257
+ "onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize, isSpecialPath: ${BrowserPathHelper.isSpecialPath(parentId)} }"
275
258
  )
276
259
  return scope.future {
277
- // Wait for browser to be registered if it's not available yet
278
- val audioBrowser =
279
- player.awaitBrowser().also { Timber.d("Browser ready, proceeding with onGetChildren") }
280
- val browserManager = audioBrowser.browserManager
281
-
282
- // While a gate is active, tabs stay visible (the root keeps serving them below) but each
283
- // non-root level is resolved per request: a gated path — including re-queries of the gate
284
- // tile's own sentinel path — serves the single gate tile, so drilling into it re-shows the
285
- // message instead of dead-ending in "No items"; an allowed path falls through to real
286
- // children. Checked before the offline guard: gated content isn't coming back with
287
- // connectivity, so the gate copy is the truer message.
288
- if (parentId != BrowserPathHelper.ROOT_PATH) {
289
- val outcome =
290
- audioBrowser.gateDecision(
291
- NativeGateRequest(reason = GateReason.BROWSE, path = parentId, search = null)
292
- )
293
- if (outcome.gated) {
294
- audioBrowser.onGate(GateEvent(GateReason.BROWSE))
295
- // gateDecision guarantees non-null chrome on a gated decision (override → default →
296
- // built-in).
297
- return@future LibraryResult.ofItemList(
298
- ImmutableList.of(createGateMediaItem(outcome.chrome!!)),
299
- params,
300
- )
260
+ children(session, browser, parentId, page, pageSize, params).also {
261
+ if (parentId == BrowserPathHelper.ROOT_PATH && page == 0) {
262
+ rootTile = deadEndTileOf(it.value.orEmpty())
301
263
  }
302
264
  }
265
+ }
266
+ }
303
267
 
304
- // The error / offline tiles are dead-ends. Some controllers (e.g. Android Auto when online)
305
- // treat a non-browsable tile as tappable and subscribe to its mediaId anyway; returning the
306
- // error tile again here would push an endless stack of error pages. Return nothing instead.
307
- // For the offline tile, re-send the alert when still offline so a tap surfaces the
308
- // explanation again — but only then, since these paths are also re-queried by
309
- // notifyChildrenChanged (e.g. when connectivity returns) without any user action.
310
- if (parentId == BrowserPathHelper.OFFLINE_PATH || parentId == BrowserPathHelper.ERROR_PATH) {
311
- if (parentId == BrowserPathHelper.OFFLINE_PATH && !player.networkMonitor.isOnline.value) {
312
- sendBrowseError(session, browser, offline = true)
313
- }
314
- return@future LibraryResult.ofItemList(ImmutableList.of<MediaItem>(), params)
268
+ /**
269
+ * The tile the root last served in place of its tabs, or null. Android Automotive OS shows such a
270
+ * root as one tab that drills into the tile's sentinel path (see [deadEndChildren]).
271
+ */
272
+ @Volatile private var rootTile: MediaItem? = null
273
+
274
+ private suspend fun children(
275
+ session: MediaLibraryService.MediaLibrarySession,
276
+ browser: MediaSession.ControllerInfo,
277
+ parentId: String,
278
+ page: Int,
279
+ pageSize: Int,
280
+ params: MediaLibraryService.LibraryParams?,
281
+ ): LibraryResult<ImmutableList<MediaItem>> {
282
+ val audioBrowser =
283
+ player.awaitBrowser().also { Timber.d("Browser ready, proceeding with onGetChildren") }
284
+ val browserManager = audioBrowser.browserManager
285
+
286
+ // While a gate is active the root keeps its tabs; a gated level, the gate tile's own sentinel
287
+ // included, serves the gate tile, so drilling into it re-shows the message, and an allowed one
288
+ // falls through. No SessionError: a gate is app state, not a failure. Before the offline
289
+ // guard: connectivity does not ungate content.
290
+ if (parentId != BrowserPathHelper.ROOT_PATH) {
291
+ val outcome =
292
+ audioBrowser.gateDecision(
293
+ NativeGateRequest(reason = GateReason.BROWSE, path = parentId, search = null)
294
+ )
295
+ if (outcome.gated) {
296
+ audioBrowser.onGate(GateEvent(GateReason.BROWSE))
297
+ // gateDecision always sets chrome on a gated outcome.
298
+ return LibraryResult.ofItemList(
299
+ ImmutableList.of(createGateMediaItem(outcome.chrome!!)),
300
+ params,
301
+ )
315
302
  }
303
+ }
316
304
 
317
- // Show offline error when offline:
318
- if (
319
- !player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
320
- ) {
321
- Timber.w("Network offline - returning error message for: $parentId")
305
+ // A tap on the offline tile re-sends the alert, but only while still offline:
306
+ // notifyChildrenChanged re-queries these paths with no user action, e.g. when connectivity
307
+ // returns.
308
+ if (BrowserPathHelper.isDeadEndPath(parentId)) {
309
+ val offline = !player.networkMonitor.isOnline.value
310
+ if (parentId == BrowserPathHelper.OFFLINE_PATH && offline) {
322
311
  sendBrowseError(session, browser, offline = true)
323
- return@future LibraryResult.ofItemList(ImmutableList.of(createOfflineMediaItem()), params)
324
312
  }
313
+ return LibraryResult.ofItemList(
314
+ deadEndChildren(parentId, rootTile, Automotive.device, offline),
315
+ params,
316
+ )
317
+ }
325
318
 
326
- try {
327
- val children =
328
- if (parentId == BrowserPathHelper.RECENT_PATH) {
329
- // TODO: implement recent media items
330
- emptyList<MediaItem>()
331
- } else if (parentId == BrowserPathHelper.ROOT_PATH) {
332
- // Return tabs as root children (limited to 4 for automotive platform compatibility)
333
- // TODO: Check what Android Auto does with empty tabs list - may need to return error?
334
- val tabs = browserManager.queryTabs()
335
- if (tabs.size > 4) {
336
- Timber.w(
337
- "Root has ${tabs.size} tabs; dropping ${tabs.size - 4} (Android Auto root limit)"
338
- )
339
- }
340
- toMediaItems(tabs.take(4))
341
- } else {
342
- // Resolve the specific path and get its children
343
- val resolvedTrack = browserManager.resolve(parentId)
344
-
345
- // Convert children to MediaItems (url is already set to contextual URL)
346
- val trackChildren =
347
- resolvedTrack.children
348
- ?: throw IllegalStateException(
349
- "Expected browsed ResolvedTrack to have a children array"
350
- )
351
- toMediaItems(trackChildren.toList())
319
+ if (
320
+ !player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
321
+ ) {
322
+ Timber.w("Network offline - returning error message for: $parentId")
323
+ sendBrowseError(session, browser, offline = true)
324
+ return LibraryResult.ofItemList(
325
+ ImmutableList.of(
326
+ createOfflineMediaItem(audioBrowser.resolveFormattedError(offlineError(), parentId))
327
+ ),
328
+ params,
329
+ )
330
+ }
331
+
332
+ return try {
333
+ val children =
334
+ if (parentId == BrowserPathHelper.ROOT_PATH) {
335
+ // Filtered before the four-tab cap so a disabled tab never costs an available one its
336
+ // slot.
337
+ val tabs = browserManager.queryTabs().filterNot { it.disabled == true }
338
+ if (tabs.size > 4) {
339
+ Timber.w(
340
+ "Root has ${tabs.size} tabs; dropping ${tabs.size - 4} (Android Auto root limit)"
341
+ )
342
+ }
343
+ toFlatMediaItems(tabs.take(4))
344
+ } else {
345
+ val resolvedTrack = browserManager.resolve(parentId)
346
+ // Section styles arrive page-folded (ADR 0011).
347
+ val sections =
348
+ resolvedTrack.styleResolvedSections()
349
+ ?: throw IllegalStateException("Expected browsed ResolvedTrack to have sections")
350
+ browserManager.warnIfGridPageLacksPromise(parentId, sections)
351
+ // An empty page resolved fine, so no SessionError: these paths are re-queried by
352
+ // notifyChildrenChanged without user action.
353
+ browseLevelItems(toMediaItems(sections)) {
354
+ audioBrowser.resolveFormattedError(emptyContentError(), parentId)
352
355
  }
356
+ }
353
357
 
354
- LibraryResult.ofItemList(ImmutableList.copyOf(children.paginate(page, pageSize)), params)
355
- } catch (e: Exception) {
356
- // A cancelled browse (controller disconnected) is not a failure — don't render it as an
357
- // error tile. awaitBrowser's TimeoutCancellationException IS a real failure, keep that.
358
- if (e is CancellationException && e !is TimeoutCancellationException) throw e
359
- Timber.e(e, "Error getting children for parentId: $parentId")
360
- // Surface an error tile instead of a bare ofError(): Media3 drops the error message on the
361
- // legacy browse bridge, which would otherwise leave an empty "No items" screen in Android
362
- // Auto. See https://github.com/androidx/media/issues/2901
363
- //
364
- // Verified on a head unit (2026-06): the AA browse list NEVER renders error text — not for
365
- // transient sendError, sticky non-fatal replication, or fatal replication
366
- // (setLibraryErrorReplicationMode). Fatal replication does show the message on the
367
- // playback screen, but presents the session as STATE_ERROR with no actions, hiding the
368
- // now-playing item and transport controls — not worth it. Tiles remain the only in-browse
369
- // signal we control.
370
- sendBrowseError(session, browser, offline = false)
371
- LibraryResult.ofItemList(ImmutableList.of(createBrowseErrorMediaItem()), params)
372
- }
358
+ LibraryResult.ofItemList(ImmutableList.copyOf(children.paginate(page, pageSize)), params)
359
+ } catch (e: Exception) {
360
+ // A cancelled browse (the controller left) is not a failure; awaitBrowser's timeout is.
361
+ if (e is CancellationException && e !is TimeoutCancellationException) throw e
362
+ Timber.e(e, "Error getting children for parentId: $parentId")
363
+ // A tile, not ofError(): see createErrorMediaItem and
364
+ // https://github.com/androidx/media/issues/2901
365
+ sendBrowseError(session, browser, offline = false)
366
+ LibraryResult.ofItemList(
367
+ ImmutableList.of(
368
+ createBrowseErrorMediaItem(
369
+ audioBrowser.resolveFormattedError(navigationErrorFor(e), parentId)
370
+ )
371
+ ),
372
+ params,
373
+ )
373
374
  }
374
375
  }
375
376
 
376
377
  /**
377
- * Sends a non-fatal [SessionError] to the controller whose browse failed, complementing the error
378
- * tile. Media3 browsers receive it via MediaController.Listener.onError; for legacy controllers
379
- * Media3 transiently attaches the error code/message to the platform session's playback state
380
- * without entering STATE_ERROR.
381
- *
382
- * NOTE: current Android Auto renders NOTHING for this (verified on a head unit — see
383
- * androidx/media#2901; the transient state is cleared microseconds after being set). It is kept
384
- * because it is the correct Media3-API error signal, costs nothing, and becomes user-visible if
385
- * Android Auto moves to consuming SessionError via the Media3 controller API.
386
- *
387
- * Dispatched to the main thread: the session and its legacy stub are application-thread bound.
378
+ * Sends [browser] a non-fatal [SessionError] alongside the error tile. Current Android Auto
379
+ * renders nothing for it (https://github.com/androidx/media/issues/2901); it is the correct
380
+ * Media3 signal and shows if Android Auto starts reading it. Dispatched to Main: the session and
381
+ * its legacy stub are application-thread bound.
388
382
  */
389
383
  @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
390
384
  private fun sendBrowseError(
@@ -402,19 +396,37 @@ class MediaSessionCallback(private val player: Player) :
402
396
  }
403
397
 
404
398
  /**
405
- * Converts tracks to MediaItems for browse delivery, routing http(s) artwork through the
406
- * content:// provider so Android Auto can load it via the ArtworkContentProvider. Image-row
407
- * tracks (a CarPlay-only rendering) are expanded into their items as regular grouped rows first —
408
- * see [TrackFactory.expandImageRows].
399
+ * Flattens sections to browse items (ADR 0010): the MediaBrowser protocol has no section node, so
400
+ * each item carries its section's title and style hints. A section with a `path` gains a "view
401
+ * more" row at every `display`: no Android Auto header is tappable, so it is the only way to the
402
+ * whole section.
409
403
  */
410
- private fun toMediaItems(tracks: List<Track>): List<MediaItem> {
404
+ private suspend fun toMediaItems(sections: List<Section>): List<MediaItem> {
411
405
  val registry = player.browseArtworkRegistry
412
406
  val authority = com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
413
- return TrackFactory.expandImageRows(tracks).map {
414
- TrackFactory.toBrowseMediaItem(it, registry, authority)
407
+ return sections.flatMap { section ->
408
+ // Android Auto has no disabled affordance, so a disabled track hides.
409
+ val children = section.children.filter { it.disabled != true }
410
+ val items = children.map { TrackFactory.toBrowseMediaItem(it, registry, authority, section) }
411
+ // A lone "view more" row under a header is a dead end.
412
+ if (section.path == null || children.isEmpty()) return@flatMap items
413
+ // Free after the first row: the browser is already up, and viewMoreTitle is memoized per
414
+ // content generation.
415
+ val title = player.awaitBrowser().browserManager.viewMoreTitle()
416
+ items +
417
+ TrackFactory.toBrowseMediaItem(
418
+ TrackFactory.navigationTrack(section, title),
419
+ registry,
420
+ authority,
421
+ section,
422
+ )
415
423
  }
416
424
  }
417
425
 
426
+ // One untitled section, so a single Track→MediaItem conversion exists.
427
+ private suspend fun toFlatMediaItems(tracks: List<Track>): List<MediaItem> =
428
+ toMediaItems(listOf(untitledSection(tracks.toTypedArray())))
429
+
418
430
  override fun onGetItem(
419
431
  session: MediaLibraryService.MediaLibrarySession,
420
432
  browser: MediaSession.ControllerInfo,
@@ -422,21 +434,53 @@ class MediaSessionCallback(private val player: Player) :
422
434
  ): ListenableFuture<LibraryResult<MediaItem>> {
423
435
  Timber.Forest.d("onGetItem: ${browser.packageName}, mediaId = $mediaId")
424
436
  return scope.future {
425
- // Handle special paths first (these don't need browser)
437
+ if (mediaId == BrowserPathHelper.ROOT_PATH) {
438
+ return@future LibraryResult.ofItem(
439
+ MediaItem.Builder()
440
+ .setMediaId(mediaId)
441
+ .setMediaMetadata(
442
+ MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
443
+ )
444
+ .build(),
445
+ null,
446
+ )
447
+ }
448
+
426
449
  if (mediaId == BrowserPathHelper.OFFLINE_PATH) {
427
- return@future LibraryResult.ofItem(createOfflineMediaItem(), null)
450
+ return@future LibraryResult.ofItem(
451
+ createOfflineMediaItem(
452
+ player
453
+ .awaitBrowser()
454
+ .resolveFormattedError(offlineError(), BrowserPathHelper.OFFLINE_PATH)
455
+ ),
456
+ null,
457
+ )
428
458
  }
429
459
 
430
- // Return the error tile as a non-browsable item so tapping it can't re-browse into a
431
- // failing path (which would push another error page onto the stack).
432
460
  if (mediaId == BrowserPathHelper.ERROR_PATH) {
433
- return@future LibraryResult.ofItem(createBrowseErrorMediaItem(), null)
461
+ return@future LibraryResult.ofItem(
462
+ createBrowseErrorMediaItem(
463
+ player
464
+ .awaitBrowser()
465
+ .resolveFormattedError(browseFailureError(), BrowserPathHelper.ERROR_PATH)
466
+ ),
467
+ null,
468
+ )
469
+ }
470
+
471
+ if (mediaId == BrowserPathHelper.EMPTY_PATH) {
472
+ return@future LibraryResult.ofItem(
473
+ createEmptyMediaItem(
474
+ player
475
+ .awaitBrowser()
476
+ .resolveFormattedError(emptyContentError(), BrowserPathHelper.EMPTY_PATH)
477
+ ),
478
+ null,
479
+ )
434
480
  }
435
481
 
482
+ // No onGate: it fires where a browse or search is served, not on an item lookup.
436
483
  if (mediaId == BrowserPathHelper.GATE_PATH) {
437
- // A direct fetch of the gate tile's own sentinel (a controller re-reading the item it was
438
- // served). Resolve the chrome for the gate path but do NOT emit onGate — that fires at the
439
- // browse/search serve sites, not on an item lookup.
440
484
  val outcome =
441
485
  player
442
486
  .awaitBrowser()
@@ -451,24 +495,10 @@ class MediaSessionCallback(private val player: Player) :
451
495
  return@future LibraryResult.ofItem(createGateMediaItem(outcome.chrome!!), null)
452
496
  }
453
497
 
454
- if (mediaId == BrowserPathHelper.ROOT_PATH || mediaId == BrowserPathHelper.RECENT_PATH) {
455
- return@future LibraryResult.ofItem(
456
- MediaItem.Builder()
457
- .setMediaId(mediaId)
458
- .setMediaMetadata(
459
- MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
460
- )
461
- .build(),
462
- null,
463
- )
464
- }
465
-
466
- // Wait for browser to be registered if it's not available yet
467
498
  val browserManager = player.awaitBrowser().browserManager
468
499
 
469
- // Serve tracks from the track cache first (keyed by url and src). Besides avoiding an HTTP
470
- // resolve, this keeps item identity correct for contextual mediaIds: resolve() strips
471
- // __trackId and would return the *parent container's* metadata as the item.
500
+ // Cache first: resolve() strips __trackId from a contextual mediaId and would answer with the
501
+ // parent container's metadata.
472
502
  val browseAuthority =
473
503
  com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
474
504
  browserManager.getCachedTrack(mediaId)?.let { track ->
@@ -480,9 +510,8 @@ class MediaSessionCallback(private val player: Player) :
480
510
 
481
511
  try {
482
512
  val resolvedTrack = browserManager.resolve(mediaId)
483
- // Through the one Track conversion, so the resolve path renders identically
484
- // to the cached-track path above (list line from subtitle, favorited heart)
485
- // and the item's tag is a Track, as fromMedia3 expects.
513
+ // The same conversion as the cached path, so the item's tag is a Track, as fromMedia3
514
+ // expects.
486
515
  LibraryResult.ofItem(
487
516
  TrackFactory.toBrowseMediaItem(
488
517
  resolvedTrack.toTrack(),
@@ -509,11 +538,9 @@ class MediaSessionCallback(private val player: Player) :
509
538
 
510
539
  synchronized(this) { parentIdSubscriptions.getOrPut(parentId) { mutableSetOf() }.add(browser) }
511
540
 
512
- // Don't call super: Media3's default onSubscribe validates the parent by calling
513
- // onGetItem(parentId), which for us is a full resolve() — an HTTP fetch whose result the
514
- // legacy stub discards for Android Auto controllers. onGetChildren already surfaces browse
515
- // failures. Keep the default's other behavior: notify Media3 (non-legacy) browsers so they
516
- // fetch the children; legacy browsers get onLoadChildren from the framework after subscribing.
541
+ // Not super: its onSubscribe validates the parent through onGetItem, a full resolve whose
542
+ // result the legacy stub discards. Kept from it: Media3 browsers are told to fetch; legacy
543
+ // browsers get onLoadChildren from the framework.
517
544
  if (browser.controllerVersion != MediaSession.ControllerInfo.LEGACY_CONTROLLER_VERSION) {
518
545
  session.notifyChildrenChanged(browser, parentId, Int.MAX_VALUE, params)
519
546
  }
@@ -537,13 +564,7 @@ class MediaSessionCallback(private val player: Player) :
537
564
  return super.onUnsubscribe(session, browser, parentId)
538
565
  }
539
566
 
540
- /**
541
- * Notifies all subscribed controllers to refresh their content. Called internally when network
542
- * state changes to refresh all subscribed paths.
543
- *
544
- * Safe to call from any thread: snapshots the subscribed paths and dispatches the session calls
545
- * to the main (Media3 application) thread.
546
- */
567
+ /** Safe from any thread. */
547
568
  private fun notifySubscribedChildrenChanged() {
548
569
  val session = mediaLibrarySession ?: return
549
570
  val parentIds = synchronized(this) { parentIdSubscriptions.keys.toList() }
@@ -552,38 +573,24 @@ class MediaSessionCallback(private val player: Player) :
552
573
  }
553
574
  }
554
575
 
555
- /**
556
- * Notifies external controllers that content at the given path has changed. Controllers
557
- * subscribed to this path will refresh their UI. Safe to call from any thread.
558
- *
559
- * @param path The path where content has changed
560
- */
576
+ /** Tells controllers subscribed to [path] to re-query it. Safe from any thread. */
561
577
  fun notifyContentChanged(path: String) {
562
578
  Timber.d("Notifying content changed for path: $path")
563
579
  val session = mediaLibrarySession ?: return
564
580
  scope.launch(Dispatchers.Main) { session.notifyChildrenChanged(path, Int.MAX_VALUE, null) }
565
581
  }
566
582
 
567
- /**
568
- * Notifies all subscribed controllers that content everywhere has changed (e.g. on a locale
569
- * switch) so they re-query their children. Pairs with AudioBrowser.invalidateAllContent(), which
570
- * clears the content cache first.
571
- */
583
+ /** Pairs with AudioBrowser.invalidateAllContent(), which clears the content cache first. */
572
584
  fun invalidateAllContent() {
573
585
  Timber.d("Invalidating all content - notifying all subscribed paths")
574
586
  notifySubscribedChildrenChanged()
575
587
  }
576
588
 
577
- /**
578
- * Called when the browser becomes available after a cold start. Notifies all subscribed
579
- * controllers to refresh their content.
580
- */
581
589
  fun notifyBrowserReady() {
582
590
  Timber.d("Browser ready - notifying all subscribed paths")
583
591
  notifySubscribedChildrenChanged()
584
592
  }
585
593
 
586
- /** Cancels in-flight browse/search work. Call when the owning player is destroyed. */
587
594
  fun destroy() {
588
595
  scope.cancel()
589
596
  }
@@ -596,8 +603,6 @@ class MediaSessionCallback(private val player: Player) :
596
603
  ): ListenableFuture<LibraryResult<Void>> {
597
604
  Timber.d("onSearch: ${browser.packageName}, query = $query")
598
605
  return scope.future {
599
- // Wait for browser registration like onGetChildren does, so a cold-start voice search
600
- // doesn't fail before JS has configured the browser.
601
606
  val audioBrowser =
602
607
  try {
603
608
  player.awaitBrowser()
@@ -607,40 +612,89 @@ class MediaSessionCallback(private val player: Player) :
607
612
  }
608
613
  val browserManager = audioBrowser.browserManager
609
614
 
610
- // External-surface search is gated with the rest of the browse tree — otherwise search is
611
- // a way around the gate. One "result": the gate tile (see onGetSearchResult).
612
615
  val searchOutcome =
613
616
  audioBrowser.gateDecision(
614
617
  NativeGateRequest(reason = GateReason.SEARCH, path = null, search = searchParams(query))
615
618
  )
619
+ // Search is gated with the browse tree, or it would route around the gate. One result: the
620
+ // gate tile (see onGetSearchResult).
616
621
  if (searchOutcome.gated) {
617
622
  audioBrowser.onGate(GateEvent(GateReason.SEARCH))
618
623
  session.notifySearchResultChanged(browser, query, 1, params)
619
624
  return@future LibraryResult.ofVoid()
620
625
  }
621
626
 
622
- // Check if search is configured
627
+ // Before announceSearch's offline branch: no search source is not-supported, online or not.
623
628
  if (!browserManager.config.hasSearch) {
624
629
  Timber.w("Search requested but no search source configured")
625
630
  return@future LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED)
626
631
  }
627
632
 
628
- try {
629
- // Execute search (automatically caches results at /__search?q=query)
630
- val searchResults = browserManager.search(query)
631
- val resultCount = searchResults.children?.size ?: 0
632
-
633
- Timber.d("Search completed: $resultCount results for query '$query'")
633
+ announceSearch(session, browser, browserManager, query, params)
634
+ LibraryResult.ofVoid()
635
+ }
636
+ }
634
637
 
635
- // Notify Media3 of search results
636
- session.notifySearchResultChanged(browser, query, resultCount, params)
638
+ /**
639
+ * Tells [browser] how many items [onGetSearchResult] will serve for [query]: its hits, or the one
640
+ * tile standing in for them, since a controller told zero never asks. Offline keeps the query for
641
+ * [reannounceOfflineSearches]; any other outcome drops it.
642
+ */
643
+ private suspend fun announceSearch(
644
+ session: MediaLibraryService.MediaLibrarySession,
645
+ browser: MediaSession.ControllerInfo,
646
+ browserManager: BrowserManager,
647
+ query: String,
648
+ params: MediaLibraryService.LibraryParams?,
649
+ ) {
650
+ if (
651
+ !player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
652
+ ) {
653
+ Timber.w("Network offline - announcing the offline tile for query: $query")
654
+ offlineSearches.record(browser, query, params)
655
+ session.notifySearchResultChanged(browser, query, 1, params)
656
+ return
657
+ }
658
+ offlineSearches.forget(browser)
659
+
660
+ try {
661
+ // Caches the results under the query, for getCachedSearchResults.
662
+ val searchResults = browserManager.search(query)
663
+ failedSearch.clear()
664
+ val resultCount = announcedSearchCount(searchResults.normalizedSections)
665
+
666
+ Timber.d("Search announced $resultCount item(s) for query '$query'")
667
+
668
+ session.notifySearchResultChanged(browser, query, resultCount, params)
669
+ } catch (e: Exception) {
670
+ if (e is CancellationException && e !is TimeoutCancellationException) throw e
671
+ Timber.e(e, "Error during search for query: $query")
672
+ // Announces the browse-error tile: an ofError renders as nothing, and without the slot the
673
+ // failure reads as "no results" by the time onGetSearchResult arrives.
674
+ failedSearch.record(query, navigationErrorFor(e))
675
+ session.notifySearchResultChanged(browser, query, 1, params)
676
+ }
677
+ }
637
678
 
638
- LibraryResult.ofVoid()
639
- } catch (e: Exception) {
640
- if (e is CancellationException && e !is TimeoutCancellationException) throw e
641
- Timber.e(e, "Error during search for query: $query")
642
- LibraryResult.ofError(SessionError.ERROR_UNKNOWN)
679
+ /**
680
+ * Re-runs each search served the offline tile, so the announced count matches what
681
+ * [onGetSearchResult] then serves from the cache this fills.
682
+ */
683
+ private suspend fun reannounceOfflineSearches() {
684
+ val pending = offlineSearches.drain()
685
+ if (pending.isEmpty()) return
686
+ val session = mediaLibrarySession ?: return
687
+ val browserManager =
688
+ try {
689
+ player.awaitBrowser().browserManager
690
+ } catch (e: TimeoutCancellationException) {
691
+ Timber.w("Timed out waiting for browser - offline searches not re-announced")
692
+ return
643
693
  }
694
+
695
+ pending.forEach { search ->
696
+ Timber.d("Network back - re-running search: ${search.query}")
697
+ announceSearch(session, search.browser, browserManager, search.query, search.params)
644
698
  }
645
699
  }
646
700
 
@@ -665,11 +719,11 @@ class MediaSessionCallback(private val player: Player) :
665
719
  }
666
720
  val browserManager = audioBrowser.browserManager
667
721
 
668
- // Gated: the single search "result" is the gate tile (paired with onSearch's count of 1).
669
722
  val searchOutcome =
670
723
  audioBrowser.gateDecision(
671
724
  NativeGateRequest(reason = GateReason.SEARCH, path = null, search = searchParams(query))
672
725
  )
726
+ // The one result onSearch announced for a gated search.
673
727
  if (searchOutcome.gated) {
674
728
  audioBrowser.onGate(GateEvent(GateReason.SEARCH))
675
729
  return@future LibraryResult.ofItemList(
@@ -678,26 +732,55 @@ class MediaSessionCallback(private val player: Player) :
678
732
  )
679
733
  }
680
734
 
681
- try {
682
- // Get cached search results from BrowserManager
683
- browserManager.getCachedSearchResults(query)?.let { tracks ->
684
- // Convert to MediaItems
685
- val searchAuthority =
686
- com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
687
- val mediaItems =
688
- tracks.map { track ->
689
- Timber.d("Search result: ${track.title} (url=${track.url}, src=${track.src})")
690
- TrackFactory.toBrowseMediaItem(track, player.browseArtworkRegistry, searchAuthority)
691
- }
735
+ // Before the failure slot, as in onGetChildren: a search that never reached the network is
736
+ // fixed by connectivity, not a server failure.
737
+ if (
738
+ !player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
739
+ ) {
740
+ Timber.w("Network offline - returning the offline tile for query: $query")
741
+ sendBrowseError(session, browser, offline = true)
742
+ return@future LibraryResult.ofItemList(
743
+ ImmutableList.of(
744
+ createOfflineMediaItem(
745
+ audioBrowser.resolveFormattedError(
746
+ offlineError(),
747
+ BrowserPathHelper.createSearchPath(query),
748
+ )
749
+ )
750
+ ),
751
+ params,
752
+ )
753
+ }
692
754
 
693
- val paginatedItems = mediaItems.paginate(page, pageSize)
694
- Timber.d("Returning ${paginatedItems.size} search results")
695
- LibraryResult.ofItemList(ImmutableList.copyOf(paginatedItems), params)
696
- }
697
- ?: run {
698
- Timber.w("No cached search results for query: $query")
699
- LibraryResult.ofItemList(ImmutableList.of(), params)
755
+ // The search failed: the same tile and SessionError as a failed browse, not the empty page.
756
+ failedSearch.errorFor(query)?.let { error ->
757
+ sendBrowseError(session, browser, offline = false)
758
+ return@future LibraryResult.ofItemList(
759
+ ImmutableList.of(
760
+ createBrowseErrorMediaItem(
761
+ audioBrowser.resolveFormattedError(error, BrowserPathHelper.createSearchPath(query))
762
+ )
763
+ ),
764
+ params,
765
+ )
766
+ }
767
+
768
+ try {
769
+ val tracks = browserManager.getCachedSearchResults(query)
770
+ if (tracks == null) Timber.w("No cached search results for query: $query")
771
+ // No hits, all disabled, or nothing cached: the app's empty copy (ADR 0001). Something must
772
+ // come back: onSearch announced at least one item.
773
+ val mediaItems =
774
+ browseLevelItems(toFlatMediaItems(tracks?.toList().orEmpty())) {
775
+ audioBrowser.resolveFormattedError(
776
+ emptyContentError(),
777
+ BrowserPathHelper.createSearchPath(query),
778
+ )
700
779
  }
780
+
781
+ val paginatedItems = mediaItems.paginate(page, pageSize)
782
+ Timber.d("Returning ${paginatedItems.size} search results")
783
+ LibraryResult.ofItemList(ImmutableList.copyOf(paginatedItems), params)
701
784
  } catch (e: Exception) {
702
785
  if (e is CancellationException && e !is TimeoutCancellationException) throw e
703
786
  Timber.e(e, "Error getting search results for query: $query")
@@ -723,40 +806,42 @@ class MediaSessionCallback(private val player: Player) :
723
806
  )
724
807
  }
725
808
 
809
+ val startPosition = startPositionMs.takeIf { it != C.TIME_UNSET }?.let { it / 1000.0 }
810
+
726
811
  return scope.future {
727
812
  val audioBrowser = player.awaitBrowser()
728
813
 
729
- // Helper: returns the current player state unchanged so Media3 doesn't modify playback.
730
- // ExoPlayer is main-thread confined; this future runs on IO, so hop to Main for the reads.
814
+ // Media3 sets whatever this returns: the controller's position would undo the handler's seek.
815
+ // Reads hop to Main: ExoPlayer is main-thread confined and this runs on IO.
731
816
  suspend fun currentPlayerState(): MediaSession.MediaItemsWithStartPosition =
732
817
  withContext(Dispatchers.Main) {
733
818
  val currentItems = player.tracks.map { TrackFactory.toMedia3(it) }
734
819
  val currentIndex = player.currentIndex ?: 0
735
- MediaSession.MediaItemsWithStartPosition(currentItems, currentIndex, startPositionMs)
820
+ MediaSession.MediaItemsWithStartPosition(
821
+ currentItems,
822
+ currentIndex,
823
+ player.restorablePositionMs,
824
+ )
736
825
  }
737
826
 
738
827
  val browserManager = audioBrowser.browserManager
739
828
 
740
- // A single tapped item resolves to the contextual url of the list it was
741
- // tapped in: directly for contextual mediaIds, via the track cache for
742
- // stable-id mediaIds (see BrowserManager.contextualUrlFor). A search
743
- // selection is not a list tap — its queue comes from the search results
744
- // (resolveMediaItemsForPlayback), never from a browsed container.
745
- val singleContextualUrl =
829
+ // A single tapped item resolves to the contextual path of the list it was tapped in. A search
830
+ // pick is not a list tap: its queue comes from the search results.
831
+ val singleContextualPath =
746
832
  mediaItems
747
833
  .singleOrNull()
748
834
  ?.takeIf { it.requestMetadata.searchQuery == null }
749
- ?.let { browserManager.contextualUrlFor(it.mediaId) }
835
+ ?.let { browserManager.contextualPathFor(it.mediaId) }
750
836
 
751
- // Check if this is a single item from the current queue source
752
- if (singleContextualUrl != null) {
753
- val parentPath = BrowserPathHelper.stripTrackId(singleContextualUrl)
754
- val trackId = BrowserPathHelper.extractTrackId(singleContextualUrl)
837
+ if (singleContextualPath != null) {
838
+ val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
839
+ val trackId = BrowserPathHelper.extractTrackId(singleContextualPath)
755
840
 
756
- // Check if queue already came from this parent path - just skip to the track
841
+ // A tap within the queue's own source list skips rather than rebuilds.
757
842
  if (trackId != null && parentPath == player.queueSourcePath) {
758
843
  val queueTracks = withContext(Dispatchers.Main) { player.tracks }
759
- val index = queueTracks.indexOfFirst { it.src == trackId }
844
+ val index = queueTracks.indexOfTappedTrack(singleContextualPath, trackId)
760
845
  if (index >= 0) {
761
846
  Timber.d("Queue already from $parentPath, skipping to index $index")
762
847
  val track = queueTracks[index]
@@ -765,9 +850,9 @@ class MediaSessionCallback(private val player: Player) :
765
850
  track,
766
851
  queueTracks,
767
852
  index.toDouble(),
853
+ startPosition,
768
854
  ::currentPlayerState,
769
855
  ) {
770
- // Return the existing queue items with the new start index
771
856
  val existingItems = queueTracks.map { TrackFactory.toMedia3(it) }
772
857
  MediaSession.MediaItemsWithStartPosition(existingItems, index, startPositionMs)
773
858
  }
@@ -779,18 +864,23 @@ class MediaSessionCallback(private val player: Player) :
779
864
  browserManager.resolveMediaItemsForPlayback(mediaItems, startIndex, startPositionMs)
780
865
 
781
866
  val tracks = result.mediaItems.map { TrackFactory.fromMedia3(it) }.toTypedArray()
782
- val selectedTrack = tracks.getOrElse(result.startIndex) { tracks.first() }
867
+ // setQueue reads an unset index as "keep the current one". Media3 still gets it unset on the
868
+ // default branch, where it means a reset.
869
+ val handlerIndex = result.startIndex.takeIf { it != C.INDEX_UNSET } ?: 0
870
+ val selectedTrack = tracks.getOrElse(handlerIndex) { tracks.first() }
783
871
 
784
872
  handleTrackLoad(
785
873
  audioBrowser.configuration.handleTrackLoad,
786
874
  selectedTrack,
787
875
  tracks,
788
- result.startIndex.toDouble(),
876
+ handlerIndex.toDouble(),
877
+ startPosition,
789
878
  ::currentPlayerState,
790
879
  ) {
791
- // If this was a contextual URL expansion, track the source path (only for default behavior)
792
- if (singleContextualUrl != null) {
793
- val parentPath = BrowserPathHelper.stripTrackId(singleContextualUrl)
880
+ // Only on handleTrackLoad's default branch: a consumer that handles the load owns the
881
+ // queue.
882
+ if (singleContextualPath != null) {
883
+ val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
794
884
  withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
795
885
  }
796
886
  result
@@ -799,29 +889,41 @@ class MediaSessionCallback(private val player: Player) :
799
889
  }
800
890
 
801
891
  /**
802
- * Handles playback resumption requests from the system (Bluetooth play button, car head unit,
803
- * etc.).
892
+ * Rebuilds the persisted queue for a system request (Bluetooth play, a head unit). With
893
+ * [isForPlayback] false it is the boot-time resumption notification asking: no network, stored
894
+ * track only.
804
895
  *
805
- * Reads the persisted playback state (URL + position + settings) and expands it into a full queue
806
- * using the browse callback. This enables seamless resumption after app restart with the same
807
- * player settings (repeat mode, shuffle, playback speed).
808
- *
809
- * @param mediaSession The media session
810
- * @param controller The controller requesting resumption
811
- * @param isForPlayback True if this should start playback; false if just gathering info for the
812
- * boot-time resumption notification (no network; local metadata only).
813
896
  * @see https://developer.android.com/media/media3/session/background-playback#resumption
814
897
  */
815
898
  override fun onPlaybackResumption(
816
899
  mediaSession: MediaSession,
817
900
  controller: MediaSession.ControllerInfo,
818
901
  isForPlayback: Boolean,
902
+ ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
903
+ val resumption = resume(controller, isForPlayback)
904
+ if (isForPlayback) {
905
+ Futures.addCallback(
906
+ resumption,
907
+ object : FutureCallback<MediaSession.MediaItemsWithStartPosition> {
908
+ override fun onSuccess(result: MediaSession.MediaItemsWithStartPosition) {}
909
+
910
+ override fun onFailure(t: Throwable) = player.onPlaybackResumptionFailed()
911
+ },
912
+ ContextCompat.getMainExecutor(player.context),
913
+ )
914
+ }
915
+ return resumption
916
+ }
917
+
918
+ private fun resume(
919
+ controller: MediaSession.ControllerInfo,
920
+ isForPlayback: Boolean,
819
921
  ): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
820
922
  Timber.d("${controller.packageName}")
821
923
 
822
924
  return scope.future {
823
- // A pure read first: restore()'s side effects (it applies repeat/shuffle/speed to the
824
- // live player, emitting option-changed events to JS) belong to actual resumption only.
925
+ // A pure read: restore() applies repeat/shuffle/speed to the live player and emits events to
926
+ // JS, so it waits for actual resumption.
825
927
  val state =
826
928
  player.playbackStateStore.get()
827
929
  ?: run {
@@ -829,9 +931,14 @@ class MediaSessionCallback(private val player: Player) :
829
931
  throw IllegalStateException("No playback state to resume")
830
932
  }
831
933
 
832
- // isForPlayback == false is the device-boot-time notification case: network may be
833
- // unavailable and we must not start playback. Return just the locally-stored track with its
834
- // already-local metadata; skip the settings restore and network queue expansion below.
934
+ // A track disabled since it was saved never plays; failing the future refuses it without
935
+ // touching the player.
936
+ if (state.track.disabled == true) {
937
+ Timber.w("Refusing resumption of disabled track: ${state.track.title}")
938
+ throw IllegalStateException("Persisted track is disabled")
939
+ }
940
+
941
+ // Before the restore and the expansion: both touch the live player or the network.
835
942
  if (!isForPlayback) {
836
943
  Timber.d("Info-gathering resumption (boot-time); returning stored track without expansion")
837
944
  return@future MediaSession.MediaItemsWithStartPosition(
@@ -841,17 +948,14 @@ class MediaSessionCallback(private val player: Player) :
841
948
  )
842
949
  }
843
950
 
844
- // restore() sets player properties which must happen on main thread
845
951
  withContext(Dispatchers.Main) { player.playbackStateStore.restore() }
846
952
 
847
- val url = state.track.url
848
- Timber.d("Resuming from url=$url, positionMs=${state.positionMs}")
953
+ val path = state.track.path
954
+ Timber.d("Resuming from path=$path, positionMs=${state.positionMs}")
849
955
 
850
- // Wait for browser to be available (JS needs to have configured it)
851
956
  val browserManager = player.awaitBrowser().browserManager
852
957
 
853
- // Try to expand the URL into a full queue
854
- val expanded = url?.let { browserManager.expandQueueFromContextualUrl(it) }
958
+ val expanded = path?.let { browserManager.expandQueueFromContextualPath(it) }
855
959
 
856
960
  if (expanded != null) {
857
961
  val (tracks, selectedIndex) = expanded
@@ -859,9 +963,8 @@ class MediaSessionCallback(private val player: Player) :
859
963
  "Restored ${tracks.size} tracks, starting at index $selectedIndex at ${state.positionMs}ms"
860
964
  )
861
965
 
862
- // Track the source path if this was a contextual URL expansion
863
- if (BrowserPathHelper.isContextual(url)) {
864
- val parentPath = BrowserPathHelper.stripTrackId(url)
966
+ if (BrowserPathHelper.isContextual(path)) {
967
+ val parentPath = BrowserPathHelper.stripTrackId(path)
865
968
  withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
866
969
  }
867
970
 
@@ -871,7 +974,6 @@ class MediaSessionCallback(private val player: Player) :
871
974
  state.positionMs,
872
975
  )
873
976
  } else {
874
- // Fallback: play just the stored track
875
977
  Timber.d("Queue expansion failed, using stored track: ${state.track.title}")
876
978
  MediaSession.MediaItemsWithStartPosition(
877
979
  ImmutableList.of(TrackFactory.toMedia3(state.track)),
@@ -882,3 +984,156 @@ class MediaSessionCallback(private val player: Player) :
882
984
  }
883
985
  }
884
986
  }
987
+
988
+ /**
989
+ * What a drill-in on a tile's sentinel path serves. Nothing, so Android Auto, which drills into a
990
+ * tile whatever its flags, dead-ends at "No items" rather than stacking error pages. Android
991
+ * Automotive OS shows a root serving only a tile as one tab that drills in here, and an empty level
992
+ * as "Media isn't available for this list", so there [rootTile] is served again, unless it is the
993
+ * offline tile and the device is back online.
994
+ */
995
+ internal fun deadEndChildren(
996
+ parentId: String,
997
+ rootTile: MediaItem?,
998
+ automotive: Boolean,
999
+ offline: Boolean,
1000
+ ): List<MediaItem> =
1001
+ listOfNotNull(
1002
+ rootTile?.takeIf {
1003
+ automotive &&
1004
+ it.mediaId == parentId &&
1005
+ (parentId != BrowserPathHelper.OFFLINE_PATH || offline)
1006
+ }
1007
+ )
1008
+
1009
+ /** The single tile of a level that serves one in place of its items, or null. */
1010
+ internal fun deadEndTileOf(items: List<MediaItem>): MediaItem? =
1011
+ items.singleOrNull()?.takeIf { BrowserPathHelper.isDeadEndPath(it.mediaId) }
1012
+
1013
+ /**
1014
+ * A non-playable item that stands in for a browse list's items: the only in-browse error signal.
1015
+ * Media3 drops [LibraryResult.ofError] on the legacy browse bridge, leaving "No items", and Android
1016
+ * Auto's browse list shows no text for a transient or replicated [SessionError]. Fatal replication
1017
+ * shows it on the playback screen only by putting the session in STATE_ERROR, which hides
1018
+ * now-playing and transport. https://github.com/androidx/media/issues/2901
1019
+ */
1020
+ internal fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
1021
+ MediaItem.Builder()
1022
+ .setMediaId(mediaId)
1023
+ .setMediaMetadata(
1024
+ MediaMetadata.Builder()
1025
+ .setTitle(title)
1026
+ .setSubtitle(subtitle)
1027
+ // Android Automotive OS drops an item that is neither browsable nor playable; Android Auto
1028
+ // ignores these flags and drills in anyway (see deadEndChildren).
1029
+ .setIsBrowsable(Automotive.device)
1030
+ .setIsPlayable(false)
1031
+ .build()
1032
+ )
1033
+ .build()
1034
+
1035
+ private fun createErrorMediaItem(mediaId: String, formatted: FormattedNavigationError): MediaItem =
1036
+ createErrorMediaItem(
1037
+ mediaId = mediaId,
1038
+ title = formatted.title,
1039
+ // List rows are single-line.
1040
+ subtitle = formatted.message?.replace('\n', ' ') ?: "",
1041
+ )
1042
+
1043
+ /**
1044
+ * From the app's path-aware empty copy (ADR 0001). No SessionError goes with it: an empty page
1045
+ * resolved fine.
1046
+ */
1047
+ internal fun createEmptyMediaItem(formatted: FormattedNavigationError): MediaItem =
1048
+ createErrorMediaItem(BrowserPathHelper.EMPTY_PATH, formatted)
1049
+
1050
+ /** From the app's copy, so one browse list never mixes the app's locale with the device's. */
1051
+ internal fun createOfflineMediaItem(formatted: FormattedNavigationError): MediaItem =
1052
+ createErrorMediaItem(BrowserPathHelper.OFFLINE_PATH, formatted)
1053
+
1054
+ /**
1055
+ * For a request that failed while online; offline is caught earlier by the networkMonitor guards,
1056
+ * so this must not say "no internet connection".
1057
+ */
1058
+ internal fun createBrowseErrorMediaItem(formatted: FormattedNavigationError): MediaItem =
1059
+ createErrorMediaItem(BrowserPathHelper.ERROR_PATH, formatted)
1060
+
1061
+ /**
1062
+ * A non-root level's or a search's items, or the lone empty tile. [formatted] is a JS hop, run only
1063
+ * when there are none. The root is not served through here.
1064
+ */
1065
+ internal suspend fun browseLevelItems(
1066
+ children: List<MediaItem>,
1067
+ formatted: suspend () -> FormattedNavigationError,
1068
+ ): List<MediaItem> = children.ifEmpty { listOf(createEmptyMediaItem(formatted())) }
1069
+
1070
+ /** No message of its own: the path carries the copy. */
1071
+ internal fun emptyContentError(): NavigationError =
1072
+ NavigationError(NavigationErrorType.EMPTY_CONTENT, "", null, null)
1073
+
1074
+ internal fun offlineError(): NavigationError =
1075
+ NavigationError(NavigationErrorType.NETWORK_ERROR, "", null, null)
1076
+
1077
+ /** What a re-read of the browse-error tile formats under: its exception is gone. */
1078
+ internal fun browseFailureError(): NavigationError =
1079
+ NavigationError(NavigationErrorType.UNKNOWN_ERROR, "", null, null)
1080
+
1081
+ /**
1082
+ * Disabled tracks hide, so they do not count. Never zero: a controller told zero never asks for
1083
+ * items, and the empty tile [MediaSessionCallback.onGetSearchResult] serves stands in.
1084
+ */
1085
+ internal fun announcedSearchCount(sections: List<Section>?): Int =
1086
+ (sections?.sumOf { section -> section.children.count { it.disabled != true } } ?: 0)
1087
+ .coerceAtLeast(1)
1088
+
1089
+ /**
1090
+ * The search each controller was last served the offline tile for. Media3 keeps no record of a
1091
+ * search and it has no subscription, so without this the offline tile stays until the user searches
1092
+ * again. Written from the IO scope and read from the connectivity observer.
1093
+ */
1094
+ internal class OfflineSearchRegistry {
1095
+ private val searches = mutableMapOf<MediaSession.ControllerInfo, OfflineSearch>()
1096
+
1097
+ @Synchronized
1098
+ fun record(
1099
+ browser: MediaSession.ControllerInfo,
1100
+ query: String,
1101
+ params: MediaLibraryService.LibraryParams?,
1102
+ ) {
1103
+ searches[browser] = OfflineSearch(browser, query, params)
1104
+ }
1105
+
1106
+ @Synchronized
1107
+ fun forget(browser: MediaSession.ControllerInfo) {
1108
+ searches.remove(browser)
1109
+ }
1110
+
1111
+ /** Takes every record: a re-run that finds the network gone again records its own. */
1112
+ @Synchronized
1113
+ fun drain(): List<OfflineSearch> = searches.values.toList().also { searches.clear() }
1114
+ }
1115
+
1116
+ internal data class OfflineSearch(
1117
+ val browser: MediaSession.ControllerInfo,
1118
+ val query: String,
1119
+ val params: MediaLibraryService.LibraryParams?,
1120
+ )
1121
+
1122
+ /**
1123
+ * The query whose search threw, so [MediaSessionCallback.onGetSearchResult] serves the error tile
1124
+ * rather than the empty one. One slot, like BrowserManager's single-entry result cache: a late
1125
+ * fetch of an earlier failed query serves the empty tile.
1126
+ */
1127
+ internal class FailedSearchSlot {
1128
+ @Volatile private var failed: Pair<String, NavigationError>? = null
1129
+
1130
+ fun record(query: String, error: NavigationError) {
1131
+ failed = query to error
1132
+ }
1133
+
1134
+ fun clear() {
1135
+ failed = null
1136
+ }
1137
+
1138
+ fun errorFor(query: String): NavigationError? = failed?.takeIf { it.first == query }?.second
1139
+ }