react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.55

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 (599) hide show
  1. package/README.md +32 -19
  2. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
  3. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
  4. package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
  5. package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
  6. package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
  7. package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
  8. package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
  9. package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
  10. package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
  11. package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
  12. package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
  13. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
  14. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
  15. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
  16. package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
  17. package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
  18. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
  19. package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
  20. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
  21. package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
  22. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
  23. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
  24. package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
  25. package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
  26. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
  27. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
  28. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
  29. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
  30. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
  31. package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
  32. package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
  33. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
  34. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
  35. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
  36. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
  37. package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
  38. package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
  39. package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
  40. package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
  41. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
  42. package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
  43. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
  44. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
  45. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
  46. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
  47. package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
  48. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
  49. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
  50. package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
  51. package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
  52. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
  53. package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
  54. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
  55. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
  56. package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
  57. package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
  58. package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
  59. package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
  60. package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
  61. package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
  62. package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
  63. package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
  64. package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
  65. package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
  66. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
  67. package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
  68. package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
  69. package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
  70. package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
  71. package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
  72. package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
  73. package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
  74. package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
  75. package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
  76. package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
  77. package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
  78. package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
  79. package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
  80. package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
  81. package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
  82. package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
  83. package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
  84. package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
  85. package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
  86. package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
  87. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
  88. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
  89. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
  90. package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
  91. package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
  92. package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
  93. package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
  94. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
  95. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
  96. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
  97. package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
  98. package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
  99. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
  100. package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
  101. package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
  102. package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
  103. package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
  104. package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
  105. package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
  106. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
  107. package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
  108. package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
  109. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
  110. package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
  111. package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
  112. package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
  113. package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
  114. package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
  115. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
  116. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
  117. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
  118. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
  119. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
  120. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
  121. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
  122. package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
  123. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
  124. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
  125. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
  126. package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
  127. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
  128. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
  129. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
  130. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
  131. package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
  132. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
  133. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
  134. package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
  135. package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
  136. package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
  137. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
  138. package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
  139. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
  140. package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
  141. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
  142. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
  143. package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
  144. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
  145. package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
  146. package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
  147. package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
  148. package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
  149. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
  150. package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
  151. package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
  152. package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
  153. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
  154. package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
  155. package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
  156. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
  157. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
  158. package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
  159. package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
  160. package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
  161. package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
  162. package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
  163. package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
  164. package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
  165. package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
  166. package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
  167. package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
  168. package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
  169. package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
  170. package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
  171. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
  172. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
  173. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
  174. package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
  175. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
  176. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
  177. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
  178. package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
  179. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
  180. package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
  181. package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
  182. package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
  183. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
  184. package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
  185. package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
  186. package/ios/AVPlayerEngine.swift +13 -21
  187. package/ios/AVPlayerEngineCallbacks.swift +2 -4
  188. package/ios/Browser/BrowseGate.swift +7 -8
  189. package/ios/Browser/BrowserConfig.swift +19 -34
  190. package/ios/Browser/BrowserError.swift +0 -1
  191. package/ios/Browser/BrowserManager.swift +29 -75
  192. package/ios/Browser/BrowserPathHelper.swift +13 -93
  193. package/ios/Browser/FavoriteSet.swift +7 -10
  194. package/ios/Browser/InertStyleDiagnostic.swift +17 -82
  195. package/ios/Browser/JsonModels.swift +11 -51
  196. package/ios/Browser/NavigationErrorState.swift +3 -2
  197. package/ios/Browser/PageResolver.swift +13 -23
  198. package/ios/Browser/RequestLayer.swift +16 -20
  199. package/ios/Browser/RequestPipeline.swift +33 -43
  200. package/ios/Browser/SearchDrillIn.swift +7 -13
  201. package/ios/Browser/SectionScope.swift +14 -26
  202. package/ios/Browser/SimpleRouter.swift +8 -15
  203. package/ios/Browser/StyleResolver.swift +12 -29
  204. package/ios/Browser/TabBarEntries.swift +6 -11
  205. package/ios/Browser/TrackIdTemplate.swift +6 -14
  206. package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
  207. package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
  208. package/ios/CarPlay/CarPlayController.swift +4 -4
  209. package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
  210. package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
  211. package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
  212. package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
  213. package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
  214. package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
  215. package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
  216. package/ios/CarPlay/CarPlaySession.swift +13 -17
  217. package/ios/CarPlay/CarPlayTemplates.swift +6 -7
  218. package/ios/CarPlay/IntentHandlers.swift +3 -5
  219. package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
  220. package/ios/CarPlay/MediaIntentHandler.swift +4 -7
  221. package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
  222. package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
  223. package/ios/CarPlay/SectionPresentation.swift +18 -28
  224. package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
  225. package/ios/Extension/Capability+RemoteCommand.swift +3 -3
  226. package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
  227. package/ios/Extension/CxxVectorConformances.swift +4 -16
  228. package/ios/Extension/NavigationError+Conversion.swift +4 -7
  229. package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
  230. package/ios/Extension/RequestConfig+Copying.swift +2 -6
  231. package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
  232. package/ios/Extension/SearchParams+Query.swift +4 -4
  233. package/ios/Extension/Section+Copying.swift +3 -6
  234. package/ios/Extension/String+IcyCharset.swift +5 -5
  235. package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
  236. package/ios/Extension/Track+AVPlayer.swift +1 -2
  237. package/ios/Extension/Track+Copying.swift +2 -8
  238. package/ios/Extension/Track+Identity.swift +4 -9
  239. package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
  240. package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
  241. package/ios/Extension/Variant+Artwork.swift +8 -22
  242. package/ios/Http/HttpClient.swift +3 -3
  243. package/ios/HybridAudioBrowser+Browser.swift +10 -16
  244. package/ios/HybridAudioBrowser+Options.swift +6 -9
  245. package/ios/HybridAudioBrowser+Player.swift +8 -16
  246. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
  247. package/ios/HybridAudioBrowser+Stubs.swift +5 -7
  248. package/ios/HybridAudioBrowser.swift +54 -79
  249. package/ios/Model/NitroTypeStubs.swift +15 -22
  250. package/ios/Model/PlayerUpdateOptions.swift +6 -21
  251. package/ios/Model/RemoteCommand.swift +2 -2
  252. package/ios/Model/TrackPlayerError.swift +9 -22
  253. package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
  254. package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
  255. package/ios/Observer/ItemObserver.swift +7 -5
  256. package/ios/Observer/PlayerObserver.swift +5 -5
  257. package/ios/PlaybackEvent.swift +2 -2
  258. package/ios/Player/AirPlayStallJudgement.swift +7 -9
  259. package/ios/Player/AudioSessionController.swift +14 -15
  260. package/ios/Player/DeferredSeek.swift +2 -2
  261. package/ios/Player/EndOfTrackJudgement.swift +6 -13
  262. package/ios/Player/ErrorStatus.swift +8 -7
  263. package/ios/Player/MediaLoader.swift +20 -24
  264. package/ios/Player/NowPlayingLines.swift +1 -4
  265. package/ios/Player/NowPlayingUpdater.swift +35 -61
  266. package/ios/Player/PersistedPlaybackState.swift +1 -2
  267. package/ios/Player/PlaybackFailure.swift +20 -24
  268. package/ios/Player/PlaybackPersistence.swift +5 -6
  269. package/ios/Player/PlaybackStateMachine.swift +8 -11
  270. package/ios/Player/PlaybackTimer.swift +8 -11
  271. package/ios/Player/Player.swift +6 -13
  272. package/ios/Player/PlayerEngine.swift +20 -20
  273. package/ios/Player/PlayerStatusTypes.swift +1 -2
  274. package/ios/Player/QueueManager.swift +23 -67
  275. package/ios/Player/RetryLoop.swift +39 -50
  276. package/ios/Player/ShuffleOrder.swift +17 -57
  277. package/ios/Player/SleepTimerManager.swift +13 -28
  278. package/ios/Player/VolumeFader.swift +16 -16
  279. package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
  280. package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
  281. package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
  282. package/ios/Tests/BrowserPathHelperTests.swift +3 -6
  283. package/ios/Tests/DeferredSeekTests.swift +1 -3
  284. package/ios/Tests/EmitterTests.swift +0 -1
  285. package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
  286. package/ios/Tests/FavoriteSetTests.swift +1 -0
  287. package/ios/Tests/GenerationMemoTests.swift +2 -2
  288. package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
  289. package/ios/Tests/JsonModelsTests.swift +5 -12
  290. package/ios/Tests/LRUCacheTests.swift +1 -5
  291. package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
  292. package/ios/Tests/MediaLoaderTests.swift +3 -12
  293. package/ios/Tests/ObserverTests.swift +3 -3
  294. package/ios/Tests/PlaybackErrorTests.swift +7 -9
  295. package/ios/Tests/PlaybackFailureTests.swift +9 -17
  296. package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
  297. package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
  298. package/ios/Tests/PlaybackTimerTests.swift +2 -3
  299. package/ios/Tests/PlayerPolicyTests.swift +10 -26
  300. package/ios/Tests/PlayerTests.swift +53 -88
  301. package/ios/Tests/PlayingStateTests.swift +0 -1
  302. package/ios/Tests/QueueManagerTests.swift +30 -80
  303. package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
  304. package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
  305. package/ios/Tests/RetryLoopTests.swift +12 -35
  306. package/ios/Tests/SearchDrillInTests.swift +4 -5
  307. package/ios/Tests/SectionPresentationTests.swift +3 -16
  308. package/ios/Tests/SectionScopeTests.swift +3 -6
  309. package/ios/Tests/SimpleRouterTests.swift +1 -5
  310. package/ios/Tests/SleepTimerManagerTests.swift +8 -11
  311. package/ios/Tests/StyleResolverTests.swift +4 -13
  312. package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
  313. package/ios/Tests/Support/TestTypes.swift +5 -15
  314. package/ios/Tests/TabBarEntriesTests.swift +0 -2
  315. package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
  316. package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
  317. package/ios/Tests/TrackIdTemplateTests.swift +2 -6
  318. package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
  319. package/ios/Tests/TrackSelectorTests.swift +3 -15
  320. package/ios/TrackSelector.swift +13 -25
  321. package/ios/Util/ArtworkFreshness.swift +6 -6
  322. package/ios/Util/ArtworkImageFetcher.swift +19 -20
  323. package/ios/Util/ConcurrentMap.swift +2 -2
  324. package/ios/Util/Emitter.swift +8 -13
  325. package/ios/Util/NetworkMonitor.swift +4 -6
  326. package/ios/Util/OutputPicker.swift +1 -1
  327. package/ios/Util/ReadyValue.swift +3 -2
  328. package/ios/Util/SFSymbolRenderer.swift +17 -30
  329. package/ios/Util/SVGProcessor.swift +5 -9
  330. package/lib/commonjs/CLAUDE.md +7 -2
  331. package/lib/commonjs/features/battery.js +16 -12
  332. package/lib/commonjs/features/battery.js.map +1 -1
  333. package/lib/commonjs/features/browser-config.js +1 -1
  334. package/lib/commonjs/features/browser.js +74 -24
  335. package/lib/commonjs/features/browser.js.map +1 -1
  336. package/lib/commonjs/features/carConnection.js +3 -4
  337. package/lib/commonjs/features/carConnection.js.map +1 -1
  338. package/lib/commonjs/features/equalizer.js +9 -5
  339. package/lib/commonjs/features/equalizer.js.map +1 -1
  340. package/lib/commonjs/features/errors.js +35 -21
  341. package/lib/commonjs/features/errors.js.map +1 -1
  342. package/lib/commonjs/features/favorites.js +15 -13
  343. package/lib/commonjs/features/favorites.js.map +1 -1
  344. package/lib/commonjs/features/gate.js +12 -6
  345. package/lib/commonjs/features/gate.js.map +1 -1
  346. package/lib/commonjs/features/metadata.js +16 -14
  347. package/lib/commonjs/features/metadata.js.map +1 -1
  348. package/lib/commonjs/features/network.js +5 -1
  349. package/lib/commonjs/features/network.js.map +1 -1
  350. package/lib/commonjs/features/nowPlaying.js +28 -14
  351. package/lib/commonjs/features/nowPlaying.js.map +1 -1
  352. package/lib/commonjs/features/output.js +8 -4
  353. package/lib/commonjs/features/output.js.map +1 -1
  354. package/lib/commonjs/features/playback/controls.js +10 -5
  355. package/lib/commonjs/features/playback/controls.js.map +1 -1
  356. package/lib/commonjs/features/playback/playWhenReady.js +6 -5
  357. package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
  358. package/lib/commonjs/features/playback/playing.js +5 -3
  359. package/lib/commonjs/features/playback/playing.js.map +1 -1
  360. package/lib/commonjs/features/playback/progress.js +11 -5
  361. package/lib/commonjs/features/playback/progress.js.map +1 -1
  362. package/lib/commonjs/features/playback/state.js +3 -3
  363. package/lib/commonjs/features/playback/state.js.map +1 -1
  364. package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
  365. package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
  366. package/lib/commonjs/features/playback/volume.js +6 -5
  367. package/lib/commonjs/features/playback/volume.js.map +1 -1
  368. package/lib/commonjs/features/player/options.js +20 -10
  369. package/lib/commonjs/features/player/options.js.map +1 -1
  370. package/lib/commonjs/features/player/setup.js +34 -38
  371. package/lib/commonjs/features/player/setup.js.map +1 -1
  372. package/lib/commonjs/features/queue/activeTrack.js +0 -1
  373. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  374. package/lib/commonjs/features/queue/queue.js +48 -20
  375. package/lib/commonjs/features/queue/queue.js.map +1 -1
  376. package/lib/commonjs/features/queue/repeatMode.js +2 -1
  377. package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
  378. package/lib/commonjs/features/queue/shuffle.js +0 -1
  379. package/lib/commonjs/features/queue/shuffle.js.map +1 -1
  380. package/lib/commonjs/features/remoteControls.js +59 -35
  381. package/lib/commonjs/features/remoteControls.js.map +1 -1
  382. package/lib/commonjs/features/sleepTimer.js +15 -6
  383. package/lib/commonjs/features/sleepTimer.js.map +1 -1
  384. package/lib/commonjs/utils/LazyNativeEmitter.js +6 -9
  385. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  386. package/lib/commonjs/utils/NativeUpdatedValue.js +13 -12
  387. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  388. package/lib/commonjs/utils/getTrackIdentity.js +6 -4
  389. package/lib/commonjs/utils/getTrackIdentity.js.map +1 -1
  390. package/lib/commonjs/utils/useDebug.js +16 -3
  391. package/lib/commonjs/utils/useDebug.js.map +1 -1
  392. package/lib/commonjs/web/NativeAudioBrowser.js +2 -4
  393. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  394. package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
  395. package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
  396. package/lib/commonjs/web/browser/sections.js +1 -1
  397. package/lib/commonjs/web/util/BrowserPathHelper.js +1 -3
  398. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  399. package/lib/module/CLAUDE.md +7 -2
  400. package/lib/module/features/battery.js +16 -12
  401. package/lib/module/features/battery.js.map +1 -1
  402. package/lib/module/features/browser-config.js +1 -1
  403. package/lib/module/features/browser.js +74 -24
  404. package/lib/module/features/browser.js.map +1 -1
  405. package/lib/module/features/carConnection.js +3 -4
  406. package/lib/module/features/carConnection.js.map +1 -1
  407. package/lib/module/features/equalizer.js +9 -5
  408. package/lib/module/features/equalizer.js.map +1 -1
  409. package/lib/module/features/errors.js +35 -21
  410. package/lib/module/features/errors.js.map +1 -1
  411. package/lib/module/features/favorites.js +15 -13
  412. package/lib/module/features/favorites.js.map +1 -1
  413. package/lib/module/features/gate.js +12 -6
  414. package/lib/module/features/gate.js.map +1 -1
  415. package/lib/module/features/metadata.js +16 -14
  416. package/lib/module/features/metadata.js.map +1 -1
  417. package/lib/module/features/network.js +5 -1
  418. package/lib/module/features/network.js.map +1 -1
  419. package/lib/module/features/nowPlaying.js +28 -14
  420. package/lib/module/features/nowPlaying.js.map +1 -1
  421. package/lib/module/features/output.js +8 -4
  422. package/lib/module/features/output.js.map +1 -1
  423. package/lib/module/features/playback/controls.js +10 -5
  424. package/lib/module/features/playback/controls.js.map +1 -1
  425. package/lib/module/features/playback/playWhenReady.js +6 -5
  426. package/lib/module/features/playback/playWhenReady.js.map +1 -1
  427. package/lib/module/features/playback/playing.js +5 -3
  428. package/lib/module/features/playback/playing.js.map +1 -1
  429. package/lib/module/features/playback/progress.js +11 -5
  430. package/lib/module/features/playback/progress.js.map +1 -1
  431. package/lib/module/features/playback/state.js +3 -3
  432. package/lib/module/features/playback/state.js.map +1 -1
  433. package/lib/module/features/playback/trackPlaybackTime.js +6 -1
  434. package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
  435. package/lib/module/features/playback/volume.js +6 -5
  436. package/lib/module/features/playback/volume.js.map +1 -1
  437. package/lib/module/features/player/options.js +20 -10
  438. package/lib/module/features/player/options.js.map +1 -1
  439. package/lib/module/features/player/setup.js +34 -38
  440. package/lib/module/features/player/setup.js.map +1 -1
  441. package/lib/module/features/queue/activeTrack.js +0 -1
  442. package/lib/module/features/queue/activeTrack.js.map +1 -1
  443. package/lib/module/features/queue/queue.js +48 -20
  444. package/lib/module/features/queue/queue.js.map +1 -1
  445. package/lib/module/features/queue/repeatMode.js +2 -1
  446. package/lib/module/features/queue/repeatMode.js.map +1 -1
  447. package/lib/module/features/queue/shuffle.js +0 -1
  448. package/lib/module/features/queue/shuffle.js.map +1 -1
  449. package/lib/module/features/remoteControls.js +59 -35
  450. package/lib/module/features/remoteControls.js.map +1 -1
  451. package/lib/module/features/sleepTimer.js +15 -6
  452. package/lib/module/features/sleepTimer.js.map +1 -1
  453. package/lib/module/utils/LazyNativeEmitter.js +6 -9
  454. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  455. package/lib/module/utils/NativeUpdatedValue.js +13 -12
  456. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  457. package/lib/module/utils/getTrackIdentity.js +6 -4
  458. package/lib/module/utils/getTrackIdentity.js.map +1 -1
  459. package/lib/module/utils/useDebug.js +16 -3
  460. package/lib/module/utils/useDebug.js.map +1 -1
  461. package/lib/module/web/NativeAudioBrowser.js +2 -4
  462. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  463. package/lib/module/web/browser/parseSearchResponse.js +3 -4
  464. package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
  465. package/lib/module/web/browser/sections.js +1 -1
  466. package/lib/module/web/util/BrowserPathHelper.js +1 -3
  467. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  468. package/lib/typescript/src/features/battery.d.ts +17 -12
  469. package/lib/typescript/src/features/battery.d.ts.map +1 -1
  470. package/lib/typescript/src/features/browser.d.ts +64 -24
  471. package/lib/typescript/src/features/browser.d.ts.map +1 -1
  472. package/lib/typescript/src/features/carConnection.d.ts +3 -4
  473. package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
  474. package/lib/typescript/src/features/equalizer.d.ts +9 -5
  475. package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
  476. package/lib/typescript/src/features/errors.d.ts +37 -22
  477. package/lib/typescript/src/features/errors.d.ts.map +1 -1
  478. package/lib/typescript/src/features/favorites.d.ts +15 -13
  479. package/lib/typescript/src/features/favorites.d.ts.map +1 -1
  480. package/lib/typescript/src/features/gate.d.ts +14 -8
  481. package/lib/typescript/src/features/gate.d.ts.map +1 -1
  482. package/lib/typescript/src/features/metadata.d.ts +37 -17
  483. package/lib/typescript/src/features/metadata.d.ts.map +1 -1
  484. package/lib/typescript/src/features/network.d.ts +5 -1
  485. package/lib/typescript/src/features/network.d.ts.map +1 -1
  486. package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
  487. package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
  488. package/lib/typescript/src/features/output.d.ts +8 -4
  489. package/lib/typescript/src/features/output.d.ts.map +1 -1
  490. package/lib/typescript/src/features/playback/controls.d.ts +10 -5
  491. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  492. package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
  493. package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
  494. package/lib/typescript/src/features/playback/playing.d.ts +16 -3
  495. package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
  496. package/lib/typescript/src/features/playback/progress.d.ts +11 -5
  497. package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
  498. package/lib/typescript/src/features/playback/state.d.ts +8 -3
  499. package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
  500. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
  501. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  502. package/lib/typescript/src/features/playback/volume.d.ts +6 -5
  503. package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
  504. package/lib/typescript/src/features/player/options.d.ts +52 -37
  505. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  506. package/lib/typescript/src/features/player/setup.d.ts +65 -60
  507. package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
  508. package/lib/typescript/src/features/queue/activeTrack.d.ts +0 -1
  509. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  510. package/lib/typescript/src/features/queue/queue.d.ts +48 -20
  511. package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
  512. package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
  513. package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
  514. package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
  515. package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
  516. package/lib/typescript/src/features/remoteControls.d.ts +58 -25
  517. package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
  518. package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
  519. package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
  520. package/lib/typescript/src/types/browser-nodes.d.ts +54 -57
  521. package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
  522. package/lib/typescript/src/types/browser.d.ts +181 -144
  523. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  524. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +6 -9
  525. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  526. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +13 -12
  527. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  528. package/lib/typescript/src/utils/getTrackIdentity.d.ts +6 -4
  529. package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -1
  530. package/lib/typescript/src/utils/useDebug.d.ts +16 -3
  531. package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
  532. package/package.json +1 -1
  533. package/src/CLAUDE.md +7 -2
  534. package/src/docs-floors.test.ts +71 -0
  535. package/src/features/battery.ts +17 -13
  536. package/src/features/browser-config.ts +1 -1
  537. package/src/features/browser.ts +65 -24
  538. package/src/features/carConnection.ts +3 -4
  539. package/src/features/equalizer.ts +9 -5
  540. package/src/features/errors.ts +37 -22
  541. package/src/features/favorites.ts +15 -13
  542. package/src/features/gate.ts +14 -8
  543. package/src/features/metadata.ts +37 -17
  544. package/src/features/network.ts +5 -1
  545. package/src/features/nowPlaying.ts +28 -14
  546. package/src/features/output.ts +8 -4
  547. package/src/features/playback/controls.ts +10 -5
  548. package/src/features/playback/playWhenReady.ts +6 -5
  549. package/src/features/playback/playing.ts +16 -3
  550. package/src/features/playback/progress.ts +11 -5
  551. package/src/features/playback/state.ts +8 -3
  552. package/src/features/playback/trackPlaybackTime.ts +9 -2
  553. package/src/features/playback/volume.ts +6 -5
  554. package/src/features/player/options.ts +54 -43
  555. package/src/features/player/setup.ts +67 -61
  556. package/src/features/queue/activeTrack.ts +0 -1
  557. package/src/features/queue/queue.ts +48 -20
  558. package/src/features/queue/repeatMode.ts +1 -1
  559. package/src/features/queue/shuffle.ts +0 -1
  560. package/src/features/remoteControls.ts +59 -35
  561. package/src/features/sleepTimer.ts +15 -7
  562. package/src/types/browser-nodes.ts +54 -57
  563. package/src/types/browser.ts +183 -146
  564. package/src/utils/LazyNativeEmitter.ts +6 -9
  565. package/src/utils/NativeUpdatedValue.ts +13 -12
  566. package/src/utils/getTrackIdentity.ts +6 -4
  567. package/src/utils/useDebug.ts +16 -3
  568. package/src/web/NativeAudioBrowser.ts +2 -4
  569. package/src/web/browser/parseSearchResponse.ts +3 -4
  570. package/src/web/browser/sections.ts +1 -1
  571. package/src/web/util/BrowserPathHelper.ts +1 -3
  572. package/website/guide/android-auto.md +25 -13
  573. package/website/guide/android-certificates.md +199 -120
  574. package/website/guide/artwork.md +93 -48
  575. package/website/guide/audio-output.md +86 -68
  576. package/website/guide/automotive.md +15 -10
  577. package/website/guide/basic-usage.md +5 -2
  578. package/website/guide/battery.md +50 -23
  579. package/website/guide/browser.md +155 -68
  580. package/website/guide/carplay.md +132 -49
  581. package/website/guide/configuration.md +85 -49
  582. package/website/guide/equalizer.md +36 -32
  583. package/website/guide/errors.md +106 -64
  584. package/website/guide/favorites.md +41 -31
  585. package/website/guide/gate.md +24 -10
  586. package/website/guide/getting-started.md +55 -2
  587. package/website/guide/hooks.md +53 -47
  588. package/website/guide/live-streams.md +80 -49
  589. package/website/guide/metadata.md +87 -53
  590. package/website/guide/migrating-from-track-player.md +94 -49
  591. package/website/guide/native-callback-fetch.md +46 -36
  592. package/website/guide/network.md +36 -20
  593. package/website/guide/now-playing.md +72 -44
  594. package/website/guide/playback.md +112 -35
  595. package/website/guide/queue.md +77 -43
  596. package/website/guide/remote-controls.md +87 -29
  597. package/website/guide/search.md +37 -22
  598. package/website/guide/sleep-timer.md +35 -14
  599. package/website/guide/track.md +59 -35
@@ -2,11 +2,9 @@ import Foundation
2
2
  import NitroModules
3
3
  import os.log
4
4
 
5
- /// The browser's state (path, content, tabs, config), its content and search caches, favorites
6
- /// and events. Pages come from `PageResolver`; requests go through `RequestPipeline`.
7
5
  @MainActor
8
6
  final class BrowserManager {
9
- // Allow creation from nonisolated contexts (e.g. HybridAudioBrowser property default)
7
+ // Nonisolated so HybridAudioBrowser can create it as a property default.
10
8
  nonisolated init() {
11
9
  pages = PageResolver(requests: requests)
12
10
  }
@@ -18,16 +16,16 @@ final class BrowserManager {
18
16
  let requests = RequestPipeline()
19
17
  private let pages: PageResolver
20
18
 
21
- // LRU cache for resolved content - keyed by path
19
+ // Entries are unhydrated; `resolve` hydrates favorites on the way out.
22
20
  private let contentCache = LRUCache<String, ResolvedTrack>(maxSize: 20)
23
21
 
24
- // Most recent search, keyed by `SearchParams.cacheKey`.
22
+ // Raw results, never hydrated ones: `FavoriteSet.hydrate` skips a track whose `favorited` is
23
+ // already set, so a hydrated slot would keep the favorites of the first search.
25
24
  private var lastSearchKey: String?
26
25
  private var lastSearchResults: [Track]?
27
26
 
28
27
  private var favorites = FavoriteSet()
29
28
 
30
- // Navigation tracking to prevent race conditions
31
29
  private var currentNavigationId: Int = 0
32
30
 
33
31
  // MARK: - Public State
@@ -42,17 +40,15 @@ final class BrowserManager {
42
40
 
43
41
  private(set) var content: ResolvedTrack? {
44
42
  didSet {
45
- // Note: Can't compare ResolvedTrack directly, always fire callback
43
+ // ResolvedTrack is not comparable, so every set emits.
46
44
  contentChanged.emit(content)
47
45
  }
48
46
  }
49
47
 
50
48
  private(set) var tabs: [Track]? {
51
49
  didSet {
52
- // Emit only on a real change: invalidateAllContent() re-queries the tabs
53
- // source on every invalidation (a callback source can re-resolve, e.g.
54
- // titles in a new locale), and an unchanged result must not churn the
55
- // CarPlay tab bar or reset its selection.
50
+ // An unchanged result must not churn the CarPlay tab bar or reset its selection;
51
+ // `invalidateAll` re-queries the tabs every time.
56
52
  if let tabs, !TabBarEntries.same(oldValue, tabs) {
57
53
  tabsChanged.emit(tabs)
58
54
  }
@@ -61,11 +57,8 @@ final class BrowserManager {
61
57
 
62
58
  // MARK: - Configuration
63
59
 
64
- /// Whether configureBrowser() has been called
65
60
  private(set) var isConfigured = false
66
61
 
67
- /// Browser configuration containing routes, search, tabs, and request settings. Kept on
68
- /// `requests`, which every request reads.
69
62
  var config: BrowserConfig {
70
63
  get { requests.config }
71
64
  set {
@@ -81,13 +74,12 @@ final class BrowserManager {
81
74
  let contentChanged = Emitter<ResolvedTrack?>()
82
75
  let tabsChanged = Emitter<[Track]>()
83
76
  let configChanged = Emitter<BrowserConfig>()
84
- /// The favorite id set changed, however it changed (e.g. from the app or a webview), so
85
- /// surfaces like the CarPlay now-playing heart can re-render.
77
+ /// Emitted on any change to the favorites, however it came about.
86
78
  let favoritesChanged = Emitter<Void>()
87
79
 
88
- /// Runs the app's `handleTrackLoad` for `event` and waits for it, both promise layers: a JS
89
- /// callback returning `Promise<void>` arrives as `Promise<Promise<Void>>`. False when the app
90
- /// set none.
80
+ /// Runs the app's `handleTrackLoad` and awaits both promise layers (a JS callback returning
81
+ /// `Promise<void>` arrives as `Promise<Promise<Void>>`); a failure is logged, not thrown. False
82
+ /// when the app set no handler.
91
83
  func awaitTrackLoadHandler(event: TrackLoadEvent) async -> Bool {
92
84
  guard let handler = config.handleTrackLoad else { return false }
93
85
  do {
@@ -100,41 +92,35 @@ final class BrowserManager {
100
92
 
101
93
  // MARK: - Favorites
102
94
 
103
- /// Sets the favorited track identities, emitting `favoritesChanged` when they change.
104
95
  func setFavorites(_ favorites: [String]) {
105
96
  if self.favorites.replace(with: favorites) {
106
97
  favoritesChanged.emit(())
107
98
  }
108
99
  }
109
100
 
110
- /// Enables/disables favoriting (propagated from the `favorite` capability).
111
101
  func setFavoriteEnabled(_ enabled: Bool) {
112
102
  favorites.enabled = enabled
113
103
  }
114
104
 
115
- /// Optimistically reflects a local favorite toggle (`FavoriteSet.set`), so the now-playing
116
- /// heart stays responsive.
117
105
  func setFavorited(identity: String, favorited: Bool) {
118
106
  favorites.set(identity, favorited: favorited)
119
107
  }
120
108
 
121
- /// `track` with its `favorited` hydrated (`FavoriteSet.hydrate`).
122
109
  func hydrateFavorite(_ track: Track) -> Track {
123
110
  favorites.hydrate(track)
124
111
  }
125
112
 
126
113
  // MARK: - Navigation
127
114
 
128
- /// Loads `path` as the current page. `bypassCache` reloads it from the network and keeps the
129
- /// content on screen meanwhile, for refreshing the current path. A newer load supersedes this one, and its
130
- /// result or failure is dropped: every caller reports a throw, so a slow /a failing after a
131
- /// fast /b succeeded would otherwise show /a's error over /b's content.
115
+ /// Loads `path` as the current page. `bypassCache` refetches it and keeps the current content
116
+ /// on screen meanwhile. A newer load supersedes this one: its result or error is dropped, so a
117
+ /// slow failing /a cannot show its error over a fast /b's content.
132
118
  func load(_ path: String, bypassCache: Bool = false) async throws {
133
119
  currentNavigationId += 1
134
120
  let navigationId = currentNavigationId
135
121
  self.path = path
136
122
  if bypassCache {
137
- // A failed reload must not leave the stale page to be served from the cache.
123
+ // So a failed reload doesn't leave the stale page in the cache.
138
124
  contentCache.remove(path)
139
125
  } else {
140
126
  content = nil
@@ -149,31 +135,22 @@ final class BrowserManager {
149
135
  }
150
136
  }
151
137
 
152
- /// Resolves content for a path with optional caching.
138
+ /// Contextual paths resolve their parent page. Favorites are hydrated on every call.
153
139
  func resolve(_ path: String, useCache: Bool = true) async throws -> ResolvedTrack {
154
- // Strip __trackId from contextual URLs
155
140
  let normalizedPath = BrowserPathHelper.stripTrackId(path)
156
141
 
157
- // Check content cache first
158
142
  if useCache, let cached = contentCache.get(normalizedPath) {
159
143
  return favorites.hydrate(cached)
160
144
  }
161
145
 
162
146
  let resolvedTrack = try await pages.resolve(normalizedPath)
163
147
 
164
- // Cache the resolved content for future navigation
165
148
  contentCache.set(normalizedPath, value: resolvedTrack)
166
149
 
167
150
  return favorites.hydrate(resolvedTrack)
168
151
  }
169
152
 
170
- /// Invalidates the content cache for a specific path.
171
- ///
172
- /// Expects a *container* path. A contextual path (`…?__trackId=…`) addresses
173
- /// a child, not a cache entry — entries are keyed by the stripped parent — so
174
- /// passing one used to remove nothing at all, silently. Android `require`s the
175
- /// same precondition; this throws so the misuse surfaces identically on both
176
- /// platforms instead of no-opping on one.
153
+ /// Throws on a contextual path, which never names a cache entry (Android requires the same).
177
154
  func invalidateContentCache(_ path: String) throws {
178
155
  guard !BrowserPathHelper.isContextual(path) else {
179
156
  throw BrowserError.invalidConfiguration(
@@ -183,10 +160,9 @@ final class BrowserManager {
183
160
  contentCache.remove(path)
184
161
  }
185
162
 
186
- /// Clears the content cache, the search cache and the resolved request layers (e.g. on a
187
- /// locale change), then re-queries the tabs and reloads the current path from the network.
188
- /// The two are independent: a failed reload goes to `reloadFailed` with its path and neither
189
- /// waits for nor cancels the tabs, and a failed tabs re-query keeps the current tabs.
163
+ /// Clears every cache and the resolved request layers, then re-queries the tabs and reloads
164
+ /// the current path, independently: a failed reload goes to `reloadFailed` with its path, and
165
+ /// a failed tabs query keeps the current tabs.
190
166
  func invalidateAll(reloadFailed: @escaping @MainActor (Error, String) async -> Void) {
191
167
  contentCache.clear()
192
168
  requests.invalidateLayers()
@@ -202,8 +178,7 @@ final class BrowserManager {
202
178
  }
203
179
  }
204
180
 
205
- /// `error` as the app's `formatNavigationError` displays it, or its default display when
206
- /// there is no formatter or it fails.
181
+ /// The app's `formatNavigationError` result, or the default when it has none or it fails.
207
182
  func formatted(_ error: NavigationError, path: String) async -> FormattedNavigationError {
208
183
  let fallback = error.defaultFormatted()
209
184
  guard let formatter = config.formatNavigationError else { return fallback }
@@ -215,51 +190,34 @@ final class BrowserManager {
215
190
 
216
191
  // MARK: - Search
217
192
 
218
- /// Execute a search query.
219
- /// Plain free-text search — wraps the structured overload with no mode/filters.
220
193
  func search(_ query: String) async throws -> ResolvedTrack {
221
194
  try await search(
222
195
  SearchParams(mode: nil, query: query, genre: nil, artist: nil, album: nil, title: nil, playlist: nil, reference: .unknown),
223
196
  )
224
197
  }
225
198
 
226
- /// Structured search, cached by the full parameter set.
227
- ///
228
- /// Voice intents reuse `query` across different structures —
229
- /// `MediaIntentCriteria` falls back to the structured value when there is no
230
- /// spoken name, so "play jazz" (genre) and a text search for "jazz" arrive
231
- /// with an identical `query` — hence `cacheKey` rather than `query`.
199
+ /// Cached by `cacheKey`, not `query`: voice intents fill `query` from a genre or artist when
200
+ /// nothing was spoken, so "play jazz" and a text search for "jazz" share a `query`.
232
201
  func search(_ params: SearchParams) async throws -> ResolvedTrack {
233
202
  let query = params.query
234
203
  let cacheKey = params.cacheKey
235
204
 
236
- // Check cache - hydrate favorites on the way out, since they may have
237
- // changed since the search ran (the slot holds the raw results for exactly
238
- // this reason — see below).
239
205
  if cacheKey == lastSearchKey, let results = lastSearchResults {
240
206
  return makeSearchResult(query: query, results: results)
241
207
  }
242
208
 
243
209
  let results = try await pages.search(params)
244
210
 
245
- // Cache the RAW results, never the hydrated ones: hydration is one-shot
246
- // (`FavoriteSet.hydrate` skips a track whose `favorited` is already set), so a
247
- // hydrated slot would serve the favorites as they were at first search
248
- // forever. The content cache keys on the same rule — it stores the
249
- // unhydrated resolve and hydrates in `resolve()`.
250
211
  lastSearchKey = cacheKey
251
212
  lastSearchResults = results
252
213
 
253
214
  return makeSearchResult(query: query, results: results)
254
215
  }
255
216
 
256
- /// Search and return playable tracks for "play «X»" voice intents, drilling
257
- /// into a browsable-only first result (place/genre page) so we play its first
258
- /// station. Decision in `SearchDrillIn.playable`; mirrors Android's
259
- /// `searchPlayable`.
217
+ /// Playable tracks for a "play X" voice intent, drilling into a browsable-only first result
218
+ /// (`SearchDrillIn.playable`). Mirrors Android's `searchPlayable`.
260
219
  func searchPlayable(_ params: SearchParams) async throws -> [Track]? {
261
- // Voice search never matches a disabled track (Track.disabled) — filtered
262
- // before drill-in so an unavailable first result can't capture the play.
220
+ // Disabled tracks go before drill-in, so an unavailable first result can't take the play.
263
221
  let children = try await ((search(params).flattenedChildren) ?? [])
264
222
  .filter { $0.disabled != true }
265
223
  return try await SearchDrillIn.playable(from: children) { [self] path in
@@ -268,12 +226,8 @@ final class BrowserManager {
268
226
  }
269
227
  }
270
228
 
271
- /// Wraps raw search results as a resolved page, hydrating favorites on the
272
- /// way out — the single exit for `search`, so an unhydrated search page can't
273
- /// be emitted (the same funnel `resolve()` has).
274
229
  private func makeSearchResult(query: String, results: [Track]) -> ResolvedTrack {
275
- // Search results are a flat list; as a resolved page they are one
276
- // untitled section (ADR 0010).
230
+ // Search results become one untitled section (ADR 0010).
277
231
  ResolvedTrack(
278
232
  path: BrowserPathHelper.createSearchPath(query),
279
233
  style: nil,
@@ -301,7 +255,6 @@ final class BrowserManager {
301
255
 
302
256
  // MARK: - Tabs
303
257
 
304
- /// Query navigation tabs.
305
258
  func queryTabs() async throws -> [Track] {
306
259
  guard let tabs = try await pages.tabs() else { return [] }
307
260
  self.tabs = tabs
@@ -310,7 +263,8 @@ final class BrowserManager {
310
263
 
311
264
  // MARK: - Queue Expansion (for CarPlay/external controllers)
312
265
 
313
- /// The queue a tap on the contextual `path` plays (`SectionScope.queue`), from its page.
266
+ /// The queue a tap on the contextual `path` plays (`SectionScope.queue`); nil when `path` is
267
+ /// not contextual.
314
268
  func expandQueueFromContextualPath(_ path: String) async throws -> (tracks: [Track], selectedIndex: Int)? {
315
269
  guard BrowserPathHelper.extractTrackId(path) != nil else { return nil }
316
270
  let resolved = try await resolve(BrowserPathHelper.stripTrackId(path), useCache: true)
@@ -3,71 +3,39 @@ import Foundation
3
3
  import NitroModules
4
4
  #endif
5
5
 
6
- /// Utility for handling browser paths and contextual URLs in the media browser system.
7
- ///
8
- /// Handles two types of special paths:
9
- /// 1. Search paths (`/__search?q=…`)
10
- /// 2. Contextual URLs: Embed parent context in track identifiers for playback integration
11
- ///
12
- /// Contextual URL format: `{parentPath}?__trackId={trackIdentity}&__index={childIndex}`
13
- /// Example: "/library/radio?__trackId=song.mp3&__index=2"
14
- ///
15
- /// `__trackId` is the identity check; `__index` (the child's position on the
16
- /// page at stamp time) is only a tie-breaker between surfaces that carry the
17
- /// same identity — a stale index never selects a different track.
18
- ///
19
- /// This allows:
20
- /// - Playable-only tracks (tracks with `src` but no `path`) to be referenced
21
- /// - Cache lookup to work consistently
22
- /// - Parent context to be preserved for queue restoration
6
+ /// Search paths (`/__search?q=…`) and contextual paths, which address a child of a page:
7
+ /// `{parentPath}?__trackId={identity}&__index={position}`. `__trackId` decides the track;
8
+ /// `__index` only breaks ties between children with the same identity, so a stale index never
9
+ /// selects a different track.
23
10
  enum BrowserPathHelper {
24
- /// Search path prefix (full path is /__search?q=query)
25
11
  static let searchPathPrefix = "/__search"
26
12
 
27
- /// Character set for percent-encoding query parameter keys and values.
28
- /// Starts from `.urlQueryAllowed` but removes characters that have special
29
- /// meaning in query strings (`&`, `=`, `+`) to prevent value corruption.
30
13
  private static let queryComponentAllowed: CharacterSet = {
31
14
  var cs = CharacterSet.urlQueryAllowed
32
15
  cs.remove(charactersIn: "&=+")
33
16
  return cs
34
17
  }()
35
18
 
36
- /// Query parameter name for contextual track identifiers
37
19
  private static let contextualTrackParam = "__trackId"
38
20
 
39
- /// Query parameter name for the tapped child's page position (tie-breaker)
40
21
  private static let contextualIndexParam = "__index"
41
22
 
42
- /// Check if a path is a search path (`/__search?q=…`)
43
23
  static func isSearchPath(_ path: String) -> Bool {
44
24
  path.hasPrefix("\(searchPathPrefix)?")
45
25
  }
46
26
 
47
- /// Create a search path for a given query
48
27
  static func createSearchPath(_ query: String) -> String {
49
28
  let encodedQuery =
50
29
  query.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? query
51
30
  return "\(searchPathPrefix)?q=\(encodedQuery)"
52
31
  }
53
32
 
54
- /// Checks if a path contains a contextual track identifier.
55
- ///
56
- /// - Parameter path: The URL path to check
57
- /// - Returns: true if the path contains the contextual track parameter
58
33
  static func isContextual(_ path: String) -> Bool {
59
34
  path.contains("?\(contextualTrackParam)=")
60
35
  || path.contains("&\(contextualTrackParam)=")
61
36
  }
62
37
 
63
- /// Strips the contextual parameters (__trackId and __index) from a contextual
64
- /// URL to get the parent path. If the URL is not contextual, returns it unchanged.
65
- ///
66
- /// - Parameter url: The URL to process
67
- /// - Returns: The URL without the contextual parameters
68
- ///
69
- /// Example: "/library/radio?__trackId=song.mp3&__index=2" → "/library/radio"
70
- /// Example: "/search?q=jazz&__trackId=song.mp3" → "/search?q=jazz"
38
+ /// Strips both `__trackId` and `__index`; `url` unchanged when it is not contextual.
71
39
  static func stripTrackId(_ url: String) -> String {
72
40
  guard isContextual(url) else {
73
41
  return url
@@ -77,12 +45,10 @@ enum BrowserPathHelper {
77
45
  return url
78
46
  }
79
47
 
80
- // Filter out the contextual parameters
81
48
  components.queryItems = components.queryItems?.filter {
82
49
  $0.name != contextualTrackParam && $0.name != contextualIndexParam
83
50
  }
84
51
 
85
- // If no query items left, clear the query string entirely
86
52
  if components.queryItems?.isEmpty == true {
87
53
  components.queryItems = nil
88
54
  }
@@ -90,18 +56,8 @@ enum BrowserPathHelper {
90
56
  return components.string ?? url
91
57
  }
92
58
 
93
- /// Builds a contextual URL by appending a track identifier — and optionally
94
- /// the tapped child's page position — to a parent path.
95
- /// Handles existing query parameters correctly.
96
- ///
97
- /// - Parameters:
98
- /// - parentPath: The parent container path
99
- /// - trackId: The track identity (`id` when non-blank, else `src`)
100
- /// - index: The child's position on the page at stamp time (tie-breaker)
101
- /// - Returns: A contextual URL combining parent path, track ID, and index
102
- ///
103
- /// Example: build("/library", "song.mp3", index: 2) → "/library?__trackId=song.mp3&__index=2"
104
- /// Example: build("/search?q=jazz", "song.mp3") → "/search?q=jazz&__trackId=song.mp3"
59
+ /// `parentPath` with `trackId` (the track's identity) and, when given, its page position
60
+ /// appended; keeps any query `parentPath` already has.
105
61
  static func build(parentPath: String, trackId: String, index: Int? = nil) -> String {
106
62
  let encodedTrackId =
107
63
  trackId.addingPercentEncoding(withAllowedCharacters: queryComponentAllowed) ?? trackId
@@ -110,13 +66,6 @@ enum BrowserPathHelper {
110
66
  return "\(parentPath)\(separator)\(contextualTrackParam)=\(encodedTrackId)\(indexParam)"
111
67
  }
112
68
 
113
- /// Extracts the track ID from a contextual URL.
114
- /// Returns nil if the URL is not contextual or doesn't contain the track ID parameter.
115
- ///
116
- /// - Parameter path: The contextual URL to parse
117
- /// - Returns: The extracted track ID, or nil if not found
118
- ///
119
- /// Example: "/library/radio?__trackId=song.mp3" → "song.mp3"
120
69
  static func extractTrackId(_ path: String) -> String? {
121
70
  guard isContextual(path) else {
122
71
  return nil
@@ -129,10 +78,7 @@ enum BrowserPathHelper {
129
78
  return components.queryItems?.first { $0.name == contextualTrackParam }?.value
130
79
  }
131
80
 
132
- /// Extracts the stamped page index from a contextual URL, or nil when the
133
- /// URL is not contextual or carries no (valid, non-negative) index.
134
- ///
135
- /// Example: "/library/radio?__trackId=song.mp3&__index=2" → 2
81
+ /// Nil when the path is not contextual or its index is missing or negative.
136
82
  static func extractIndex(_ path: String) -> Int? {
137
83
  guard isContextual(path),
138
84
  let components = URLComponents(string: path),
@@ -144,16 +90,7 @@ enum BrowserPathHelper {
144
90
  return index
145
91
  }
146
92
 
147
- /// Appends query parameters to a URL, handling `?` vs `&` separator and percent-encoding.
148
- ///
149
- /// - Parameters:
150
- /// - query: Dictionary of query parameter key-value pairs
151
- /// - url: The URL to append parameters to
152
- /// - Returns: The URL with query parameters appended
153
- ///
154
- /// Examples:
155
- /// - appendQuery(["q": "jazz"], to: "/search") → "/search?q=jazz"
156
- /// - appendQuery(["page": "2"], to: "/items?sort=new") → "/items?sort=new&page=2"
93
+ /// Percent-encodes keys and values, so pass them unencoded.
157
94
  static func appendQuery(_ query: [String: String], to url: String) -> String {
158
95
  guard !query.isEmpty else { return url }
159
96
 
@@ -169,31 +106,17 @@ enum BrowserPathHelper {
169
106
  return "\(url)\(separator)\(queryString)"
170
107
  }
171
108
 
172
- /// Combines a base URL with a path, ensuring proper slash handling.
173
- ///
174
- /// - Parameters:
175
- /// - baseUrl: The base URL (can be nil)
176
- /// - path: The path to append
177
- /// - Returns: The combined URL with proper slash handling
178
- ///
179
- /// Examples:
180
- /// - buildUrl("http://example.com", "api/test") → "http://example.com/api/test"
181
- /// - buildUrl("http://example.com/", "/api/test") → "http://example.com/api/test"
182
- /// - buildUrl(nil, "/api/test") → "/api/test"
183
- /// - buildUrl(nil, "http://full.url") → "http://full.url"
109
+ /// `path` joined to `baseUrl` with one slash; `path` alone when it is a full http(s) URL or
110
+ /// there is no base, and the base alone when `path` is empty or only slashes.
184
111
  static func buildUrl(baseUrl: String?, path: String) -> String {
185
- // If path is already a full URL, return it as-is
186
112
  if path.hasPrefix("http://") || path.hasPrefix("https://") {
187
113
  return path
188
114
  }
189
115
 
190
- // If no baseUrl, return path as-is
191
116
  guard let baseUrl else {
192
117
  return path
193
118
  }
194
119
 
195
- // Strip trailing slashes from the base and leading slashes from the path so
196
- // they join with exactly one separator.
197
120
  var normalizedBase = baseUrl
198
121
  while normalizedBase.hasSuffix("/") {
199
122
  normalizedBase.removeLast()
@@ -204,8 +127,6 @@ enum BrowserPathHelper {
204
127
  normalizedPath.removeFirst()
205
128
  }
206
129
 
207
- // Empty path → the base IS the full URL (e.g. a search endpoint whose
208
- // baseUrl already includes the path); don't leave a dangling trailing slash.
209
130
  if normalizedPath.isEmpty {
210
131
  return normalizedBase
211
132
  }
@@ -215,9 +136,8 @@ enum BrowserPathHelper {
215
136
  }
216
137
 
217
138
  extension BrowserPathHelper {
218
- /// `sections` with a contextual path on every playable-only track (a `src` and no `path`), so
219
- /// it can be addressed: `parentPath`, the track's identity and its flat page position (children
220
- /// concatenated in section order). Throws when a track has neither `path` nor `src`.
139
+ /// `sections` with a contextual path on every track that has a `src` and no `path`, its index
140
+ /// counted across all sections. Throws on a track with neither.
221
141
  static func stampingContextualPaths(_ sections: [Section], parentPath: String) throws -> [Section] {
222
142
  var flatIndex = 0
223
143
  return try sections.map { section in
@@ -2,14 +2,13 @@
2
2
  import NitroModules
3
3
  #endif
4
4
 
5
- /// The favorited track identities (id when non-blank, else src), and whether favoriting is on:
6
- /// the player's `favorite` capability. Hydrates a track's `favorited` from them.
5
+ /// The favorited track identities and whether favoriting is on (the player's `favorite`
6
+ /// capability).
7
7
  struct FavoriteSet {
8
8
  private var identities: Set<String> = []
9
- /// Off, tracks are left as they are: no row hearts.
10
9
  var enabled = false
11
10
 
12
- /// Replaces the identities with `favorites`; false when that changes nothing.
11
+ /// False when `favorites` holds the identities already there.
13
12
  mutating func replace(with favorites: [String]) -> Bool {
14
13
  let replaced = Set(favorites)
15
14
  guard replaced != identities else { return false }
@@ -17,8 +16,7 @@ struct FavoriteSet {
17
16
  return true
18
17
  }
19
18
 
20
- /// Reflects a local favorite toggle until the consumer's next `replace(with:)`, which
21
- /// reconciles the set to its canonical one.
19
+ /// A local toggle; the consumer's next `replace(with:)` overrides it.
22
20
  mutating func set(_ identity: String, favorited: Bool) {
23
21
  if favorited {
24
22
  identities.insert(identity)
@@ -27,16 +25,15 @@ struct FavoriteSet {
27
25
  }
28
26
  }
29
27
 
30
- /// `track` with `favorited` set to true or false, so a track that is not favorited still shows
31
- /// an empty heart. Unchanged when favoriting is off, when the track has no identity, or when it
32
- /// already carries `favorited`: a value from the API or the consumer wins, as on Android and web.
28
+ /// `track` with `favorited` true or false, so an unfavorited track shows an empty heart.
29
+ /// Unchanged when favoriting is off, the track has no identity, or it already carries
30
+ /// `favorited`: a value from the API or the consumer wins, as on Android and web.
33
31
  func hydrate(_ track: Track) -> Track {
34
32
  // `identity` bridges a std::string out of the C++ track, so it is read once.
35
33
  guard enabled, track.favorited == nil, let identity = track.identity else { return track }
36
34
  return track.copying(favorited: identities.contains(identity))
37
35
  }
38
36
 
39
- /// Every track of a normalized page (ADR 0010) hydrated.
40
37
  func hydrate(_ page: ResolvedTrack) -> ResolvedTrack {
41
38
  guard let sections = page.sections else { return page }
42
39
  return page.copying(sections: sections.map { section in