react-native-audio-browser 0.2.0-next.52 → 0.2.0-next.54

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 (329) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
  3. package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
  4. package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
  5. package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
  6. package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
  7. package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
  8. package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
  9. package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
  10. package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
  11. package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
  12. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
  13. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
  14. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
  15. package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
  16. package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
  17. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
  18. package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
  19. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
  20. package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
  21. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
  22. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
  23. package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
  24. package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
  25. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
  26. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
  27. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
  28. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
  29. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
  30. package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
  31. package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
  32. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
  33. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
  34. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
  35. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
  36. package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
  37. package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
  38. package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
  39. package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
  40. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
  41. package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
  42. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
  43. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
  44. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
  45. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
  46. package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
  47. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
  48. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
  49. package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
  50. package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
  51. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
  52. package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
  53. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
  54. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
  55. package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
  56. package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
  57. package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
  58. package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
  59. package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
  60. package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
  61. package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
  62. package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
  63. package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
  64. package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
  65. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +35 -49
  66. package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
  67. package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
  68. package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
  69. package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
  70. package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
  71. package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
  72. package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
  73. package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
  74. package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
  75. package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
  76. package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
  77. package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
  78. package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
  79. package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
  80. package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
  81. package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
  82. package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
  83. package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
  84. package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
  85. package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
  86. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
  87. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
  88. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
  89. package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
  90. package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
  91. package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
  92. package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
  93. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
  94. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
  95. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
  96. package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
  97. package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
  98. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
  99. package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
  100. package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
  101. package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
  102. package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
  103. package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
  104. package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
  105. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
  106. package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
  107. package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
  108. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
  109. package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
  110. package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
  111. package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
  112. package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
  113. package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
  114. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
  115. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
  116. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
  117. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
  118. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
  119. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
  120. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
  121. package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
  122. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
  123. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
  124. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
  125. package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
  126. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
  127. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
  128. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
  129. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
  130. package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
  131. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
  132. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
  133. package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
  134. package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
  135. package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
  136. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
  137. package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
  138. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
  139. package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
  140. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
  141. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
  142. package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
  143. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +16 -2
  144. package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
  145. package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
  146. package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
  147. package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +26 -4
  148. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
  149. package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
  150. package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
  151. package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
  152. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
  153. package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
  154. package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
  155. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +15 -11
  156. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +112 -1
  157. package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
  158. package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
  159. package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
  160. package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
  161. package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
  162. package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
  163. package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
  164. package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
  165. package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
  166. package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
  167. package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
  168. package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
  169. package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
  170. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
  171. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
  172. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
  173. package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
  174. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
  175. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
  176. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
  177. package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
  178. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
  179. package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
  180. package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
  181. package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
  182. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
  183. package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
  184. package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
  185. package/ios/AVPlayerEngine.swift +13 -21
  186. package/ios/AVPlayerEngineCallbacks.swift +2 -4
  187. package/ios/Browser/BrowseGate.swift +7 -8
  188. package/ios/Browser/BrowserConfig.swift +19 -34
  189. package/ios/Browser/BrowserError.swift +0 -1
  190. package/ios/Browser/BrowserManager.swift +29 -75
  191. package/ios/Browser/BrowserPathHelper.swift +13 -93
  192. package/ios/Browser/FavoriteSet.swift +7 -10
  193. package/ios/Browser/InertStyleDiagnostic.swift +17 -82
  194. package/ios/Browser/JsonModels.swift +11 -51
  195. package/ios/Browser/NavigationErrorState.swift +3 -2
  196. package/ios/Browser/PageResolver.swift +13 -23
  197. package/ios/Browser/RequestLayer.swift +16 -20
  198. package/ios/Browser/RequestPipeline.swift +33 -43
  199. package/ios/Browser/SearchDrillIn.swift +7 -13
  200. package/ios/Browser/SectionScope.swift +14 -26
  201. package/ios/Browser/SimpleRouter.swift +8 -15
  202. package/ios/Browser/StyleResolver.swift +12 -29
  203. package/ios/Browser/TabBarEntries.swift +6 -11
  204. package/ios/Browser/TrackIdTemplate.swift +6 -14
  205. package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
  206. package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
  207. package/ios/CarPlay/CarPlayController.swift +4 -4
  208. package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
  209. package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
  210. package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
  211. package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
  212. package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
  213. package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
  214. package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
  215. package/ios/CarPlay/CarPlaySession.swift +13 -17
  216. package/ios/CarPlay/CarPlayTemplates.swift +6 -7
  217. package/ios/CarPlay/IntentHandlers.swift +3 -5
  218. package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
  219. package/ios/CarPlay/MediaIntentHandler.swift +4 -7
  220. package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
  221. package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
  222. package/ios/CarPlay/SectionPresentation.swift +18 -28
  223. package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
  224. package/ios/Extension/Capability+RemoteCommand.swift +3 -3
  225. package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
  226. package/ios/Extension/CxxVectorConformances.swift +4 -16
  227. package/ios/Extension/NavigationError+Conversion.swift +4 -7
  228. package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
  229. package/ios/Extension/RequestConfig+Copying.swift +2 -6
  230. package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
  231. package/ios/Extension/SearchParams+Query.swift +4 -4
  232. package/ios/Extension/Section+Copying.swift +3 -6
  233. package/ios/Extension/String+IcyCharset.swift +5 -5
  234. package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
  235. package/ios/Extension/Track+AVPlayer.swift +1 -2
  236. package/ios/Extension/Track+Copying.swift +2 -8
  237. package/ios/Extension/Track+Identity.swift +4 -9
  238. package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
  239. package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
  240. package/ios/Extension/Variant+Artwork.swift +8 -22
  241. package/ios/Http/HttpClient.swift +3 -3
  242. package/ios/HybridAudioBrowser+Browser.swift +10 -16
  243. package/ios/HybridAudioBrowser+Options.swift +6 -9
  244. package/ios/HybridAudioBrowser+Player.swift +8 -16
  245. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
  246. package/ios/HybridAudioBrowser+Stubs.swift +5 -7
  247. package/ios/HybridAudioBrowser.swift +54 -79
  248. package/ios/Model/NitroTypeStubs.swift +15 -22
  249. package/ios/Model/PlayerUpdateOptions.swift +6 -21
  250. package/ios/Model/RemoteCommand.swift +2 -2
  251. package/ios/Model/TrackPlayerError.swift +9 -22
  252. package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
  253. package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
  254. package/ios/Observer/ItemObserver.swift +7 -5
  255. package/ios/Observer/PlayerObserver.swift +5 -5
  256. package/ios/PlaybackEvent.swift +2 -2
  257. package/ios/Player/AirPlayStallJudgement.swift +7 -9
  258. package/ios/Player/AudioSessionController.swift +14 -15
  259. package/ios/Player/DeferredSeek.swift +2 -2
  260. package/ios/Player/EndOfTrackJudgement.swift +6 -13
  261. package/ios/Player/ErrorStatus.swift +8 -7
  262. package/ios/Player/MediaLoader.swift +20 -24
  263. package/ios/Player/NowPlayingLines.swift +1 -4
  264. package/ios/Player/NowPlayingUpdater.swift +35 -61
  265. package/ios/Player/PersistedPlaybackState.swift +1 -2
  266. package/ios/Player/PlaybackFailure.swift +20 -24
  267. package/ios/Player/PlaybackPersistence.swift +5 -6
  268. package/ios/Player/PlaybackStateMachine.swift +8 -11
  269. package/ios/Player/PlaybackTimer.swift +8 -11
  270. package/ios/Player/Player.swift +6 -13
  271. package/ios/Player/PlayerEngine.swift +20 -20
  272. package/ios/Player/PlayerStatusTypes.swift +1 -2
  273. package/ios/Player/QueueManager.swift +23 -67
  274. package/ios/Player/RetryLoop.swift +39 -50
  275. package/ios/Player/ShuffleOrder.swift +17 -57
  276. package/ios/Player/SleepTimerManager.swift +13 -28
  277. package/ios/Player/VolumeFader.swift +16 -16
  278. package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
  279. package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
  280. package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
  281. package/ios/Tests/BrowserPathHelperTests.swift +3 -6
  282. package/ios/Tests/DeferredSeekTests.swift +1 -3
  283. package/ios/Tests/EmitterTests.swift +0 -1
  284. package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
  285. package/ios/Tests/FavoriteSetTests.swift +1 -0
  286. package/ios/Tests/GenerationMemoTests.swift +2 -2
  287. package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
  288. package/ios/Tests/JsonModelsTests.swift +5 -12
  289. package/ios/Tests/LRUCacheTests.swift +1 -5
  290. package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
  291. package/ios/Tests/MediaLoaderTests.swift +3 -12
  292. package/ios/Tests/ObserverTests.swift +3 -3
  293. package/ios/Tests/PlaybackErrorTests.swift +7 -9
  294. package/ios/Tests/PlaybackFailureTests.swift +9 -17
  295. package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
  296. package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
  297. package/ios/Tests/PlaybackTimerTests.swift +2 -3
  298. package/ios/Tests/PlayerPolicyTests.swift +10 -26
  299. package/ios/Tests/PlayerTests.swift +53 -88
  300. package/ios/Tests/PlayingStateTests.swift +0 -1
  301. package/ios/Tests/QueueManagerTests.swift +30 -80
  302. package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
  303. package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
  304. package/ios/Tests/RetryLoopTests.swift +12 -35
  305. package/ios/Tests/SearchDrillInTests.swift +4 -5
  306. package/ios/Tests/SectionPresentationTests.swift +3 -16
  307. package/ios/Tests/SectionScopeTests.swift +3 -6
  308. package/ios/Tests/SimpleRouterTests.swift +1 -5
  309. package/ios/Tests/SleepTimerManagerTests.swift +8 -11
  310. package/ios/Tests/StyleResolverTests.swift +4 -13
  311. package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
  312. package/ios/Tests/Support/TestTypes.swift +5 -15
  313. package/ios/Tests/TabBarEntriesTests.swift +0 -2
  314. package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
  315. package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
  316. package/ios/Tests/TrackIdTemplateTests.swift +2 -6
  317. package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
  318. package/ios/Tests/TrackSelectorTests.swift +3 -15
  319. package/ios/TrackSelector.swift +13 -25
  320. package/ios/Util/ArtworkFreshness.swift +6 -6
  321. package/ios/Util/ArtworkImageFetcher.swift +19 -20
  322. package/ios/Util/ConcurrentMap.swift +2 -2
  323. package/ios/Util/Emitter.swift +8 -13
  324. package/ios/Util/NetworkMonitor.swift +4 -6
  325. package/ios/Util/OutputPicker.swift +1 -1
  326. package/ios/Util/ReadyValue.swift +3 -2
  327. package/ios/Util/SFSymbolRenderer.swift +17 -30
  328. package/ios/Util/SVGProcessor.swift +5 -9
  329. package/package.json +1 -1
@@ -18,11 +18,9 @@ import org.mockito.Mockito.mock
18
18
  import org.mockito.Mockito.`when`
19
19
 
20
20
  /**
21
- * Exercises [CachingCertificateFetcher.fetch] against a real loopback server.
22
- *
23
- * The safety helpers have their own unit tests, but a predicate that is never consulted protects
24
- * nothing: these cover the *wiring*, so that removing the `isSafeUrl` guard or swapping
25
- * `readCapped` back for a plain read-to-EOF fails a test rather than passing silently.
21
+ * [CachingCertificateFetcher.fetch] against a loopback server: the wiring of the safety helpers,
22
+ * which have their own unit tests, so dropping the `isSafeUrl` guard or the `readCapped` read fails
23
+ * here.
26
24
  */
27
25
  class CachingCertificateFetcherCallSiteTest {
28
26
 
@@ -33,10 +31,6 @@ class CachingCertificateFetcherCallSiteTest {
33
31
  server?.close()
34
32
  }
35
33
 
36
- /**
37
- * Serves [response] to every connection, recording the request line of the first. [handled]
38
- * counts accepted connections.
39
- */
40
34
  private fun startServer(
41
35
  response: ByteArray = "HTTP/1.0 404 Not Found\r\n\r\n".toByteArray(),
42
36
  handled: AtomicInteger = AtomicInteger(),
@@ -58,7 +52,7 @@ class CachingCertificateFetcherCallSiteTest {
58
52
  }
59
53
  }
60
54
  } catch (e: Exception) {
61
- return@thread // socket closed, or the client hung up
55
+ return@thread
62
56
  }
63
57
  }
64
58
  }
@@ -70,7 +64,6 @@ class CachingCertificateFetcherCallSiteTest {
70
64
  val handled = AtomicInteger()
71
65
  val port = startServer(handled = handled)
72
66
 
73
- // Without the isSafeUrl guard this connects and emits "SET foo bar" as its own request line.
74
67
  val certs = CachingCertificateFetcher().fetch("http://127.0.0.1:$port/\r\nSET foo bar\r\n")
75
68
 
76
69
  assertTrue(certs.isEmpty())
@@ -104,9 +97,8 @@ class CachingCertificateFetcherCallSiteTest {
104
97
 
105
98
  @Test(timeout = 30_000)
106
99
  fun `an oversized response is abandoned rather than read to EOF`() {
107
- // Asserting only that the fetch fails would prove nothing — 4 MiB crosses loopback in
108
- // milliseconds and would fail to parse either way. What has to be true is that the client
109
- // stopped reading, which shows up as the server's write not draining.
100
+ // An empty result alone proves nothing: 64 MiB crosses loopback in milliseconds and fails to
101
+ // parse either way. The client must stop reading, which shows as the server's write failing.
110
102
  val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
111
103
  server = socket
112
104
  val written = AtomicInteger()
@@ -118,8 +110,6 @@ class CachingCertificateFetcherCallSiteTest {
118
110
  val out = client.getOutputStream()
119
111
  out.write("HTTP/1.0 200 OK\r\n\r\n".toByteArray())
120
112
  val chunk = ByteArray(64 * 1024)
121
- // 64 MiB — far past the 1 MiB cap. Once the client stops reading and closes, this
122
- // throws a broken pipe, which is the signal we want.
123
113
  repeat(1024) {
124
114
  out.write(chunk)
125
115
  written.addAndGet(chunk.size)
@@ -133,8 +123,7 @@ class CachingCertificateFetcherCallSiteTest {
133
123
 
134
124
  assertTrue(certs.isEmpty())
135
125
  assertTrue(finished.await(20, TimeUnit.SECONDS))
136
- // Socket buffers mean the server gets somewhat past the cap before the write fails, but it
137
- // must be nowhere near the 64 MiB it wanted to send.
126
+ // Socket buffers let the server write somewhat past the 1 MiB cap before the write fails.
138
127
  assertTrue(
139
128
  "server wrote ${written.get()} bytes; the read was not cut off",
140
129
  written.get() < 16 shl 20,
@@ -143,8 +132,6 @@ class CachingCertificateFetcherCallSiteTest {
143
132
 
144
133
  @Test(timeout = 30_000)
145
134
  fun `a real certificate is fetched, parsed and then served from cache`() {
146
- // The success path, end to end over a socket: every other wire test serves a failure, so a
147
- // broken body offset or a broken cache write would not show up anywhere.
148
135
  val der = CertFixtures.bytes("letsencrypt-r13.der")
149
136
  val handled = AtomicInteger()
150
137
  val port =
@@ -161,17 +148,13 @@ class CachingCertificateFetcherCallSiteTest {
161
148
  assertEquals(1, certs.size)
162
149
  assertEquals("CN=R13,O=Let's Encrypt,C=US", certs.first().subjectX500Principal.name)
163
150
 
164
- // Second call must be served from the cache, not the network.
165
151
  assertEquals(certs, fetcher.fetch(url))
166
152
  assertEquals("a successful fetch must be cached", 1, handled.get())
167
153
  }
168
154
 
169
- /**
170
- * A mock certificate whose AIA extension lists [url] as its one CA-Issuers location, so
171
- * [AiaCertChaser.completeChain] chases it with this fetcher — the real wiring, end to end.
172
- */
155
+ /** A mock certificate whose AIA extension lists [url] as its one CA Issuers location. */
173
156
  private fun certPointingAt(url: String): X509Certificate {
174
- // Short-form DER lengths only; a loopback URL is far under 128 bytes.
157
+ // Short-form DER lengths only, which a loopback URL under 128 bytes fits.
175
158
  fun der(tag: Int, content: ByteArray) =
176
159
  byteArrayOf(tag.toByte(), content.size.toByte()) + content
177
160
  val caIssuersOid = byteArrayOf(0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02)
@@ -185,7 +168,7 @@ class CachingCertificateFetcherCallSiteTest {
185
168
  )
186
169
  return mock(X509Certificate::class.java).also {
187
170
  `when`(it.getExtensionValue("1.3.6.1.5.5.7.1.1")).thenReturn(aia)
188
- // Distinct principals, or the chaser reads the mock as a self-signed root and never fetches.
171
+ // Distinct principals, or the chaser takes the mock for a self-signed root and never fetches.
189
172
  `when`(it.subjectX500Principal).thenReturn(X500Principal("CN=leaf"))
190
173
  `when`(it.issuerX500Principal).thenReturn(X500Principal("CN=issuer"))
191
174
  }
@@ -193,9 +176,8 @@ class CachingCertificateFetcherCallSiteTest {
193
176
 
194
177
  @Test(timeout = 30_000)
195
178
  fun `a drip-feeding server is cut off by the chase deadline, not only the per-fetch caps`() {
196
- // One byte every 100 ms: each read lands well inside the socket timeout, so per-read limits
197
- // never fire, and the per-fetch read budget alone would let this run for its full 10 s. The
198
- // walk's 1 s budget must cut the fetch *itself* — not merely decline to start the next one.
179
+ // A byte every 100 ms stays inside the read timeout, and the per-fetch read budget would allow
180
+ // 10 s: only the chase's 1 s budget cutting the fetch itself keeps this under 8 s.
199
181
  val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
200
182
  server = socket
201
183
  thread(isDaemon = true) {
@@ -205,7 +187,7 @@ class CachingCertificateFetcherCallSiteTest {
205
187
  val out = client.getOutputStream()
206
188
  out.write("HTTP/1.0 200 OK\r\n\r\n".toByteArray())
207
189
  out.flush()
208
- repeat(300) { // 30 s of drip on offer; the client must not stay for it
190
+ repeat(300) {
209
191
  out.write(0)
210
192
  out.flush()
211
193
  Thread.sleep(100)
@@ -224,16 +206,13 @@ class CachingCertificateFetcherCallSiteTest {
224
206
  val elapsedMs = (System.nanoTime() - started) / 1_000_000
225
207
 
226
208
  assertEquals(listOf(cert), completed)
227
- // Well past the 1 s budget to absorb scheduling noise, but far short of the 10 s the
228
- // per-fetch read budget alone would have allowed.
229
209
  assertTrue("chase ran for $elapsedMs ms", elapsedMs < 8_000)
230
210
  }
231
211
 
232
212
  @Test(timeout = 30_000)
233
213
  fun `the chase deadline spans redirect hops, not just fetch starts`() {
234
- // Every hop stalls 1 s and then redirects back to itself. Each hop sits comfortably inside
235
- // the per-operation timeouts, so only a deadline threaded through the redirect recursion
236
- // can end the fetch — without one it walks all 5 redirects, ~6 s here.
214
+ // Each hop stalls 1 s, inside every per-operation timeout, then redirects to itself; without
215
+ // the deadline the fetch walks all 5 redirects, about 6 s.
237
216
  val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
238
217
  server = socket
239
218
  thread(isDaemon = true) {
@@ -271,7 +250,6 @@ class CachingCertificateFetcherCallSiteTest {
271
250
  val socket = ServerSocket(0, 50, InetAddress.getByName("127.0.0.1"))
272
251
  server = socket
273
252
  val accepted = CountDownLatch(1)
274
- // Accept, then hold the connection open saying nothing at all.
275
253
  thread(isDaemon = true) {
276
254
  runCatching {
277
255
  val client = socket.accept()
@@ -314,8 +292,6 @@ class CachingCertificateFetcherCallSiteTest {
314
292
 
315
293
  @Test
316
294
  fun `the cache is bounded`() {
317
- // Far more distinct URLs than MAX_CACHE_ENTRIES; nothing is cached here (every fetch fails),
318
- // but the bound is what stops an attacker-chosen URL space from growing without limit.
319
295
  assertFalse(CachingCertificateFetcher.MAX_CACHE_ENTRIES <= 0)
320
296
  assertTrue(CachingCertificateFetcher.MAX_CACHE_ENTRIES <= 128)
321
297
  }
@@ -44,7 +44,6 @@ class CachingCertificateFetcherTest {
44
44
 
45
45
  @Test
46
46
  fun `decodes a chunked body`() {
47
- // "DEAD" + "BEEF" split across two chunks, terminated by a zero-length chunk.
48
47
  val raw =
49
48
  ("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n" +
50
49
  "4\r\nDEAD\r\n4\r\nBEEF\r\n0\r\n\r\n")
@@ -75,8 +74,6 @@ class CachingCertificateFetcherTest {
75
74
  )
76
75
  }
77
76
 
78
- // -- response cap (the AIA URL, so the host serving it, comes from the presented cert) --
79
-
80
77
  // -- URL validation (the AIA URL is attacker-supplied text from the presented cert) --
81
78
 
82
79
  @Test
@@ -87,8 +84,6 @@ class CachingCertificateFetcherTest {
87
84
 
88
85
  @Test
89
86
  fun `rejects a URL carrying CRLF, which would inject request lines`() {
90
- // java.net.URL keeps the CRLF in `file`, and the cleartext fetch writes `file` straight
91
- // into "GET $path HTTP/1.0\r\n" on a raw socket.
92
87
  assertTrue(!CachingCertificateFetcher.isSafeUrl("http://127.0.0.1:6379/\r\nSET foo bar\r\n"))
93
88
  assertTrue(!CachingCertificateFetcher.isSafeUrl("http://ca.example/a\nX-Injected: 1"))
94
89
  }
@@ -98,6 +93,8 @@ class CachingCertificateFetcherTest {
98
93
  assertTrue(!CachingCertificateFetcher.isSafeUrl("http://ca.example/a b"))
99
94
  }
100
95
 
96
+ // -- response cap (the AIA URL, so the host serving it, comes from the presented cert) --
97
+
101
98
  @Test
102
99
  fun `reads a response that fits within the cap`() {
103
100
  val body = ByteArray(64) { it.toByte() }
@@ -117,8 +114,6 @@ class CachingCertificateFetcherTest {
117
114
 
118
115
  @Test
119
116
  fun `a stream that never ends does not read without bound`() {
120
- // Endless: read() always fills the buffer and never signals EOF, the shape a slow-drip
121
- // server takes — the per-read timeout never fires because every read succeeds.
122
117
  val endless =
123
118
  object : InputStream() {
124
119
  override fun read() = 0
@@ -131,9 +126,8 @@ class CachingCertificateFetcherTest {
131
126
 
132
127
  @Test
133
128
  fun `a slow drip is cut off by the deadline, not left to exhaust the byte cap`() {
134
- // One byte per read, each one landing just inside the socket's read timeout: the byte cap
135
- // alone would let this run for a million reads. The clock advances 1s per read, so the
136
- // 10s budget must end it after ~10 — far short of the 1 MiB cap.
129
+ // The clock advances 1 s per one-byte read, so the 10 s budget ends it after about 10 reads;
130
+ // the 1 MiB byte cap alone would allow a million.
137
131
  var reads = 0
138
132
  val drip =
139
133
  object : InputStream() {
@@ -31,7 +31,6 @@ class ArtworkContentProviderTest {
31
31
  registry = BrowseArtworkRegistry()
32
32
  val context = RuntimeEnvironment.getApplication()
33
33
 
34
- // Delete on-disk cache so tests don't bleed into each other via cached files.
35
34
  File(context.cacheDir, ArtworkContentProvider.ARTWORK_SUBDIR).deleteRecursively()
36
35
 
37
36
  val fakeBitmap = Bitmap.createBitmap(8, 8, Bitmap.Config.ARGB_8888)
@@ -44,7 +43,6 @@ class ArtworkContentProviderTest {
44
43
  @After
45
44
  fun tearDown() {
46
45
  CoilArtworkLoaderHolder.get()?.let { CoilArtworkLoaderHolder.clearIf(it) }
47
- // Clean up any files written during the test.
48
46
  val context = RuntimeEnvironment.getApplication()
49
47
  File(context.cacheDir, ArtworkContentProvider.ARTWORK_SUBDIR).deleteRecursively()
50
48
  }
@@ -64,10 +62,9 @@ class ArtworkContentProviderTest {
64
62
  val pfd = provider.openFile(uri(token), "r")
65
63
  assertNotNull(pfd)
66
64
  val bytes = java.io.FileInputStream(pfd!!.fileDescriptor).readBytes()
67
- assertNotNull(BitmapFactory.decodeByteArray(bytes, 0, bytes.size)) // valid image
65
+ assertNotNull(BitmapFactory.decodeByteArray(bytes, 0, bytes.size))
68
66
  }
69
67
 
70
- // Prove E-mitigation: file FD has a real stat size (non-negative); a pipe FD would return -1.
71
68
  @Test
72
69
  fun `openFile returns a file-backed seekable FD (statSize non-negative)`() {
73
70
  val token = ArtworkUris.tokenFor("https://cdn/seekable.png")
@@ -100,8 +97,6 @@ class ArtworkContentProviderTest {
100
97
  assertNull(provider.openFile(uri(token), "r"))
101
98
  }
102
99
 
103
- // Fix 2: artwork dir must not grow beyond MAX_CACHE_FILES after producing many distinct tokens.
104
- // We override the cap to 5 so the test stays fast (rather than producing 512+ real files).
105
100
  @Test
106
101
  fun `openFile prunes cache to MAX_CACHE_FILES after producing excess entries`() {
107
102
  val testCap = 5
@@ -109,7 +104,7 @@ class ArtworkContentProviderTest {
109
104
  try {
110
105
  val context = RuntimeEnvironment.getApplication()
111
106
  val artworkDir = File(context.cacheDir, ArtworkContentProvider.ARTWORK_SUBDIR)
112
- val produce = testCap + 3 // 8 entries total; should be pruned back to 5
107
+ val produce = testCap + 3
113
108
  repeat(produce) { i ->
114
109
  val url = "https://cdn/prune-$i.png"
115
110
  val token = ArtworkUris.tokenFor(url)
@@ -126,8 +121,6 @@ class ArtworkContentProviderTest {
126
121
  }
127
122
  }
128
123
 
129
- // Prove D-fix: two openFile calls for the same token → loadCount == 1.
130
- // The second call is served from the on-disk file without re-decoding.
131
124
  @Test
132
125
  fun `openFile serves second request from disk cache without re-decoding`() {
133
126
  var loadCount = 0
@@ -142,13 +135,11 @@ class ArtworkContentProviderTest {
142
135
  val token = ArtworkUris.tokenFor("https://cdn/b.png")
143
136
  registry.register(token, ResolvedArtwork("https://cdn/b.png", null, isSvg = false))
144
137
 
145
- // First call — decode + write to disk.
146
138
  val pfd1 = provider.openFile(uri(token), "r")
147
139
  assertNotNull(pfd1)
148
140
  val bytes1 = java.io.FileInputStream(pfd1!!.fileDescriptor).readBytes()
149
141
  assertNotNull(BitmapFactory.decodeByteArray(bytes1, 0, bytes1.size))
150
142
 
151
- // Second call — must come from disk, no second decode.
152
143
  val pfd2 = provider.openFile(uri(token), "r")
153
144
  assertNotNull(pfd2)
154
145
  val bytes2 = java.io.FileInputStream(pfd2!!.fileDescriptor).readBytes()
@@ -13,7 +13,6 @@ class ArtworkUrisTest {
13
13
  fun `tokenFor is deterministic and opaque`() {
14
14
  val url = "https://cdn.example.com/a.png?sig=abc&x=1"
15
15
  assertEquals(ArtworkUris.tokenFor(url), ArtworkUris.tokenFor(url))
16
- // token does not leak the url
17
16
  assert(!ArtworkUris.tokenFor(url).contains("cdn.example.com"))
18
17
  }
19
18
 
@@ -12,10 +12,6 @@ class BrowserPathHelperTest {
12
12
 
13
13
  @Test
14
14
  fun `build round-trips a src carrying its own query params`() {
15
- // A src carrying its own query string (signed CDN URL) must survive the
16
- // build → extract/strip round-trip: an unescaped `&` would split the src
17
- // into stray query params, truncating the trackId and polluting the
18
- // parent path.
19
15
  val src = "https://cdn.example.com/stream.mp3?token=abc&exp=1699999999"
20
16
  val url = BrowserPathHelper.build("/library", src)
21
17
  assertEquals(src, BrowserPathHelper.extractTrackId(url))
@@ -45,7 +45,7 @@ class CoilArtworkLoaderHolderTest {
45
45
  val second = deps()
46
46
  CoilArtworkLoaderHolder.set(first)
47
47
  CoilArtworkLoaderHolder.set(second)
48
- CoilArtworkLoaderHolder.clearIf(first) // stale instance — must NOT clear
48
+ CoilArtworkLoaderHolder.clearIf(first)
49
49
  assertSame(second, CoilArtworkLoaderHolder.get())
50
50
  CoilArtworkLoaderHolder.clearIf(second)
51
51
  assertNull(CoilArtworkLoaderHolder.get())
@@ -20,7 +20,6 @@ class CoilArtworkLoaderTest {
20
20
  val context = RuntimeEnvironment.getApplication()
21
21
  var captured: ImageRequest? = null
22
22
  val fakeBitmap = Bitmap.createBitmap(8, 8, Bitmap.Config.ARGB_8888)
23
- // FakeImageLoader records the request and returns a known bitmap.
24
23
  val imageLoader = FakeImageLoader(context, fakeBitmap) { captured = it }
25
24
 
26
25
  val loader = CoilArtworkLoader(context, imageLoader, defaultSizePixels = 512)
@@ -34,11 +33,8 @@ class CoilArtworkLoaderTest {
34
33
 
35
34
  assertEquals(fakeBitmap, bmp)
36
35
  assertNotNull(captured)
37
- // data is the finalUrl
38
36
  assertEquals("https://cdn.example.com/a.png", captured!!.data)
39
- // OOM-prevention downsample: .size(256) must have been applied
40
37
  assertEquals(Size(Dimension.Pixels(256), Dimension.Pixels(256)), captured!!.sizeResolver.size())
41
- // Custom headers must reach the request via httpHeaders extras
42
38
  assertEquals("Bearer t", captured!!.httpHeaders["Authorization"])
43
39
  }
44
40
 
@@ -52,7 +48,6 @@ class CoilArtworkLoaderTest {
52
48
  val bmp = loader.load("https://cdn.example.com/a.png", null, null, false)
53
49
  assertEquals(fakeBitmap, bmp)
54
50
  assertNotNull(captured)
55
- // When sizeHintPixels is null, defaultSizePixels (512) must be used
56
51
  assertEquals(Size(Dimension.Pixels(512), Dimension.Pixels(512)), captured!!.sizeResolver.size())
57
52
  }
58
53
  }
@@ -14,8 +14,8 @@ import coil3.request.SuccessResult
14
14
  import kotlinx.coroutines.CompletableDeferred
15
15
 
16
16
  /**
17
- * Minimal [ImageLoader] test double. Records each executed [ImageRequest] via [onRequest] and
18
- * returns a [SuccessResult] wrapping [fakeBitmap].
17
+ * An [ImageLoader] whose every request succeeds with [fakeBitmap]. Only [execute] reports the
18
+ * request to [onRequest].
19
19
  */
20
20
  class FakeImageLoader(
21
21
  private val context: Context,
@@ -12,12 +12,6 @@ import org.junit.Test
12
12
  import org.junit.runner.RunWith
13
13
  import org.robolectric.RobolectricTestRunner
14
14
 
15
- /**
16
- * The extras are where a section survives the flat MediaBrowser protocol (ADR 0010): the owning
17
- * section stamps the Android Auto group-title header hint and the per-item display hint. Per-item
18
- * hints derive from the section resolution; a track's own `display` is positional — the page
19
- * promise a browsable track emits as the parent-level hint, never its own tile shape (ADR 0011).
20
- */
21
15
  @RunWith(RobolectricTestRunner::class)
22
16
  class MediaExtrasBuilderTest {
23
17
  private val track = TestFixtures.track()
@@ -120,9 +114,8 @@ class MediaExtrasBuilderTest {
120
114
 
121
115
  @Test
122
116
  fun `the view-all navigation track carries the section's declared display as its promise`() {
123
- // A "view all" page has no consumer-authored handle — the synthetic
124
- // navigation track projects the section's declared block, the only
125
- // declared promise that page can ever have.
117
+ // A "view all" page has no consumer-authored handle: the navigation track carries the
118
+ // section's declared style, the only promise that page can have.
126
119
  val section =
127
120
  TestFixtures.section(
128
121
  arrayOf(track),
@@ -143,9 +136,8 @@ class MediaExtrasBuilderTest {
143
136
 
144
137
  @Test
145
138
  fun `an unstyled section under a grid page stamps the grid hint end to end`() {
146
- // The wire that makes ResolvedTrack.style real: page block ->
147
- // styleResolvedSections fold -> per-item hint. Without the fold, every
148
- // narrower unit test stays green while the page tier goes dark.
139
+ // Covers the page style -> styleResolvedSections fold -> per-item hint wiring, which no
140
+ // narrower test here exercises.
149
141
  val page =
150
142
  TestFixtures.resolvedTrack(
151
143
  style = sectionStyle(display = StyleDisplay.GRID, artworkRendering = null, gridWrap = null),
@@ -19,7 +19,7 @@ import org.robolectric.RuntimeEnvironment
19
19
  import org.robolectric.Shadows.shadowOf
20
20
  import org.robolectric.annotation.Config
21
21
 
22
- // API 32: OutputMonitor reads connected devices there, which Robolectric shadows; it does not
22
+ // API 32: OutputMonitor reads the connected devices there, which Robolectric shadows; it does not
23
23
  // shadow API 33's getAudioDevicesForAttributes.
24
24
  @RunWith(RobolectricTestRunner::class)
25
25
  @Config(sdk = [32])
@@ -4,10 +4,6 @@ import com.margelo.nitro.audiobrowser.PlaybackState
4
4
  import org.junit.Assert.assertEquals
5
5
  import org.junit.Test
6
6
 
7
- /**
8
- * Truth table for the PlayingState derivation — the single transition function behind
9
- * `onPlaybackPlayingState` (see Player.refreshPlayingState, its only production caller path).
10
- */
11
7
  class PlayingStateFactoryTest {
12
8
 
13
9
  @Test
@@ -36,7 +36,7 @@ class TrackFactoryBrowseTest {
36
36
  val entry = reg.lookup(token!!)!!
37
37
  assertEquals("https://cdn/a.svg", entry.finalUrl)
38
38
  assertEquals("Bearer t", entry.headers!!["Authorization"])
39
- assertEquals(true, entry.isSvg) // detected from the .svg url
39
+ assertEquals(true, entry.isSvg)
40
40
  }
41
41
 
42
42
  @Test
@@ -7,10 +7,9 @@ import org.junit.runner.RunWith
7
7
  import org.robolectric.RobolectricTestRunner
8
8
 
9
9
  /**
10
- * The mediaId is the item's identity on car surfaces: Android Auto marks the "now playing" browse
11
- * row by exact mediaId equality between rows and the player's current item, so a playable track
12
- * with a stable `id` must use it on both — a consumer-loaded track's `src` can differ textually
13
- * from the browse row's for the same item.
10
+ * Android Auto marks the "now playing" browse row by exact mediaId equality with the player's
11
+ * current item, so a playable track with a stable `id` uses it on both: a consumer-loaded track's
12
+ * `src` can differ textually from the browse row's.
14
13
  */
15
14
  @RunWith(RobolectricTestRunner::class)
16
15
  class TrackFactoryMediaIdTest {
@@ -40,8 +39,7 @@ class TrackFactoryMediaIdTest {
40
39
 
41
40
  @Test
42
41
  fun `browsable-only track keeps path as mediaId even with an id`() {
43
- // Navigation parentIds must stay resolvable paths, so a container's id is
44
- // never its mediaId.
42
+ // Navigation parentIds must stay resolvable paths.
45
43
  val track = TestFixtures.browseTrack(path = "/stations").copy(id = "abc123")
46
44
  assertEquals("/stations", TrackFactory.toMedia3(track).mediaId)
47
45
  }
@@ -20,7 +20,7 @@ class CastEndsTest {
20
20
  assertNull(idle(load(1), MediaStatus.IDLE_REASON_FINISHED))
21
21
  }
22
22
 
23
- // The Default Media Receiver, after a load it can't fetch: IDLE with the load's media, then
23
+ // As the Default Media Receiver reports a load it can't fetch: IDLE with the load's media, then
24
24
  // IDLE/ERROR without media.
25
25
  @Test
26
26
  fun `two loads that fail in a row are each reported`() {
@@ -59,6 +59,7 @@ class SendingMediaItemConverterTest {
59
59
  val sent = converter.toMediaQueueItem(station)
60
60
 
61
61
  assertEquals(MediaInfo.STREAM_TYPE_LIVE, sent.media!!.streamType)
62
+ // The URL has no extension, so the type falls back to audio/mpeg.
62
63
  assertEquals("audio/mpeg", sent.media!!.contentType)
63
64
  assertTrue(converter.toMediaItem(sent).isRemoteLive)
64
65
  }
@@ -4,9 +4,7 @@ import MediaPlayer
4
4
  import NitroModules
5
5
  import os.log
6
6
 
7
- /// The `PlayerEngine` over AVFoundation: the AVPlayer and its observers, media loading, the
8
- /// now-playing session and the remote commands. Carries out what the `Player` decides; holds
9
- /// no playback policy.
7
+ /// Carries out what the `Player` decides; holds no playback policy.
10
8
  @MainActor
11
9
  final class AVPlayerEngine: PlayerEngine {
12
10
  let logger = Logger(subsystem: "com.audiobrowser", category: "AVPlayerEngine")
@@ -26,12 +24,10 @@ final class AVPlayerEngine: PlayerEngine {
26
24
  private var itemObserver: ItemObserver?
27
25
  private var rate: Float = 1
28
26
  private var skipAvailability = (canNext: false, canPrevious: false)
29
- /// The charset of the track last loaded, for its ICY titles.
30
27
  private var icyCharset: String?
31
28
  private let bufferDuration: Double
32
29
 
33
30
  /// - Parameters:
34
- /// - resolver: Resolves media URLs and now-playing artwork.
35
31
  /// - bufferDuration: 0 lets AVPlayer choose, minimising stalls.
36
32
  /// - nowPlayingEnabled: When false the now-playing surface ignores the override and formatter.
37
33
  init(
@@ -71,8 +67,7 @@ final class AVPlayerEngine: PlayerEngine {
71
67
  setUpAVPlayer()
72
68
  }
73
69
 
74
- /// Releases the player for good: the now-playing session, the observers and the remote
75
- /// commands go with it.
70
+ /// Releases the player for good, with its now-playing session, observers and remote commands.
76
71
  func destroy() {
77
72
  remoteCommandController.disableAll()
78
73
  nowPlayingInfoController.unlinkPlayer()
@@ -96,9 +91,10 @@ final class AVPlayerEngine: PlayerEngine {
96
91
  return seconds.isNaN ? 0 : seconds
97
92
  }
98
93
 
99
- /// The current item's duration, or 0 when it has none (a live stream). Not
100
- /// `item.asset.duration`: deprecated since iOS 16, and it blocks the main actor fetching a
101
- /// remote asset's duration.
94
+ /// The item's duration; for a live stream, the length of its seekable window (an HLS playlist or
95
+ /// DVR window), or 0 when it has none (e.g. Icecast) or there is no item.
96
+ // Not `item.asset.duration`: deprecated since iOS 16, and it blocks the main actor fetching a
97
+ // remote asset's duration.
102
98
  var duration: Double {
103
99
  guard let item = avPlayer.currentItem else { return 0 }
104
100
  if !item.duration.seconds.isNaN {
@@ -292,14 +288,12 @@ final class AVPlayerEngine: PlayerEngine {
292
288
  }
293
289
  }
294
290
 
295
- /// The item's own error stands in when the report carried none.
296
291
  private func reportFailure(_ error: Error?) {
297
292
  onEvent?(.failed(error ?? avPlayer.currentItem?.error, httpStatusCode: currentItemHttpStatusCode))
298
293
  }
299
294
 
300
- /// The HTTP status the server last answered the current item with. `AVPlayerItem.error` never
301
- /// carries it (a 404 arrives as an opaque CoreMedia error), so the per-item error log is the
302
- /// only place it surfaces.
295
+ // `AVPlayerItem.error` never carries the HTTP status (a 404 arrives as an opaque CoreMedia
296
+ // error); the item's error log is the only place it surfaces.
303
297
  private var currentItemHttpStatusCode: Int? {
304
298
  guard let events = avPlayer.currentItem?.errorLog()?.events else { return nil }
305
299
  return PlaybackFailure.httpStatusCode(fromErrorStatusCodes: events.map(\.errorStatusCode))
@@ -339,12 +333,11 @@ final class AVPlayerEngine: PlayerEngine {
339
333
  }
340
334
  }
341
335
 
342
- /// `MPNowPlayingSession` publishes only through the linked player's current item, so a load
343
- /// that fails before item creation (a dead host on a cold start) leaves nothing to surface on
344
- /// the lock screen or CarPlay. The failed asset's item is attached purely as a publishing
345
- /// carrier, unobserved, so its `.failed` status cannot re-report the loader's error. A
346
- /// successful load replaces it; a retry's reload leaves it in place, so the surface doesn't
347
- /// flicker.
336
+ // `MPNowPlayingSession` publishes only through the linked player's current item, so a load that
337
+ // fails before an item exists (a dead host on a cold start) shows nothing on the lock screen or
338
+ // CarPlay. The failed asset's item carries the publishing, unobserved so its `.failed` status
339
+ // cannot re-report the loader's error. A successful load replaces it; a retry leaves it in
340
+ // place, so the surface doesn't flicker.
348
341
  private func attachPublishingCarrierItemIfNeeded() {
349
342
  guard avPlayer.currentItem == nil, let asset = mediaLoader.asset else { return }
350
343
  logger.notice("Attaching publishing-carrier item for failed load")
@@ -354,7 +347,6 @@ final class AVPlayerEngine: PlayerEngine {
354
347
  }
355
348
  }
356
349
 
357
- /// Resolves the URLs the player fetches.
358
350
  @MainActor
359
351
  protocol MediaResolving: AnyObject {
360
352
  func resolveMediaUrl(_ src: String, track: Track?) async -> MediaResolvedUrl
@@ -2,13 +2,11 @@ import AVFoundation
2
2
  import MediaPlayer
3
3
  import NitroModules
4
4
 
5
- /// What the AVPlayerEngine reports: the remote commands, and the metadata and now-playing
6
- /// changes, which carry AVFoundation types. HybridAudioBrowser implements it. The method names
7
- /// are prefixed so they don't collide with the JS callback properties.
5
+ /// What the AVPlayerEngine reports to HybridAudioBrowser. The `playerDid` prefix keeps the
6
+ /// methods from colliding with HybridAudioBrowser's JS callback properties.
8
7
  @MainActor
9
8
  protocol AVPlayerEngineCallbacks: RemoteCommandCallbacks {
10
9
  func playerDidReceiveCommonMetadata(_ metadata: [AVMetadataItem])
11
10
  func playerDidReceiveChapterMetadata(_ metadata: [AVTimedMetadataGroup])
12
- /// The now-playing lines or track changed; carries the metadata JS sees.
13
11
  func playerDidChangeNowPlaying(_ metadata: NowPlayingMetadata)
14
12
  }
@@ -1,6 +1,6 @@
1
1
  import NitroModules
2
2
 
3
- /// The Browse Gate: an app-imposed block on browsing and searching from external surfaces,
3
+ /// The Browse Gate: the app's block on browsing and searching from external surfaces,
4
4
  /// decided per request. It never blocks the Player, the Queue or Now Playing.
5
5
  @MainActor
6
6
  final class BrowseGate {
@@ -8,19 +8,19 @@ final class BrowseGate {
8
8
  case off
9
9
  /// Every request is gated, with this chrome or the built-in one.
10
10
  case fixed(Gate?)
11
- /// JS decides each request; `default` is the chrome when its decision carries none.
11
+ /// JS decides each request; `default` is the chrome when its decision names none.
12
12
  case resolved(default: Gate?)
13
13
  }
14
14
 
15
- /// Served when a request is gated with no chrome from JS or `setGate`.
16
15
  static let builtInChrome = Gate(title: "Unavailable", message: nil)
17
16
 
18
17
  private(set) var mode: Mode = .off
19
18
 
20
- /// Fires `isActive` on every set and clear; chrome is per request, so surfaces re-render.
19
+ /// Fires `isActive` on every `set`, even an unchanged one: chrome is per request, so
20
+ /// surfaces re-render.
21
21
  let changed = Emitter<Bool>()
22
22
 
23
- /// Asks JS for a decision; set by the bridge, whose JS resolver it calls.
23
+ /// Set by the bridge to call the JS resolver. The default throws, which gates every request.
24
24
  var resolve: @MainActor (NativeGateRequest) async throws -> GateDecision = { _ in throw CancellationError() }
25
25
 
26
26
  nonisolated init() {}
@@ -40,9 +40,8 @@ final class BrowseGate {
40
40
  changed.emit(false)
41
41
  }
42
42
 
43
- /// The chrome to show if `request` is gated; nil when it is allowed. A resolver that fails
44
- /// cannot prove the request allowed, so it is gated: a gate exists to withhold content, and
45
- /// serving on an error would leak it.
43
+ /// The chrome to show if `request` is gated; nil when it is allowed. A resolver that throws
44
+ /// gates the request: serving on an error would leak what the gate withholds.
46
45
  func decide(_ request: NativeGateRequest) async -> Gate? {
47
46
  switch mode {
48
47
  case .off: