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
@@ -30,7 +30,6 @@ class RemoteSwitchingPlayerTest {
30
30
  private val live = mutableSetOf<String>()
31
31
  private val unresolvable = mutableSetOf<String>()
32
32
 
33
- /** Holds a resolution until completed, for the steps that must wait on one. */
34
33
  private var gate: CompletableDeferred<Unit>? = null
35
34
 
36
35
  private val player =
@@ -149,6 +148,113 @@ class RemoteSwitchingPlayerTest {
149
148
  assertEquals(1, receiver.stops)
150
149
  }
151
150
 
151
+ @Test
152
+ fun `the session ending never shows the receiver's own item`() {
153
+ playLocally(listOf("a"))
154
+ remote.startSession()
155
+ idle()
156
+ val shown = mutableListOf<String?>()
157
+ player.addListener(
158
+ object : MediaPlayer.Listener {
159
+ override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
160
+ shown += mediaItem?.localConfiguration?.uri?.toString()
161
+ }
162
+ }
163
+ )
164
+
165
+ remote.endSession()
166
+ idle()
167
+
168
+ assertEquals(emptyList<String>(), shown.filterNot { it == "https://s/a" })
169
+ }
170
+
171
+ @Test
172
+ fun `the session ending after the receiver failed plays the item on the phone where it was`() {
173
+ playLocally(listOf("a", "b"), index = 1)
174
+ remote.startSession()
175
+ idle()
176
+ remote.player.positionMs = 7_000
177
+ remote.player.update()
178
+ remote.fail()
179
+ idle()
180
+ assertEquals(PlaybackException.ERROR_CODE_REMOTE_ERROR, player.playerError?.errorCode)
181
+
182
+ remote.endSession()
183
+ idle()
184
+
185
+ assertFalse(player.isRemote)
186
+ assertEquals(1, local.index)
187
+ assertEquals(7_000, local.positionMs)
188
+ assertTrue(local.playWhenReady)
189
+ assertEquals(2, local.prepares)
190
+ assertNull(player.playerError)
191
+ }
192
+
193
+ @Test
194
+ fun `the session ending after the item didn't resolve plays it on the phone`() {
195
+ unresolvable += "a"
196
+ playLocally(listOf("a"), positionMs = 4_000)
197
+ remote.startSession()
198
+ idle()
199
+ assertEquals(PlaybackException.ERROR_CODE_REMOTE_ERROR, player.playerError?.errorCode)
200
+
201
+ remote.endSession()
202
+ idle()
203
+
204
+ assertEquals(4_000, local.positionMs)
205
+ assertTrue(local.playWhenReady)
206
+ assertEquals(2, local.prepares)
207
+ }
208
+
209
+ @Test
210
+ fun `the session ending after a live item didn't resolve plays it on the phone at its live edge`() {
211
+ unresolvable += "a"
212
+ local.setMediaItems(listOf(item("a").buildUpon().setLiveConfiguration(LIVE).build()), 0, 90_000)
213
+ local.playWhenReady = true
214
+ local.prepare()
215
+ idle()
216
+ remote.startSession()
217
+ idle()
218
+
219
+ remote.endSession()
220
+ idle()
221
+
222
+ assertEquals(0, local.positionMs)
223
+ assertEquals(2, local.prepares)
224
+ }
225
+
226
+ @Test
227
+ fun `the session ending after the receiver didn't start in time plays the item on the phone`() {
228
+ playLocally(listOf("a"))
229
+ remote.startSession()
230
+ idle()
231
+ remote.player.lagging = true
232
+ player.seekToDefaultPosition()
233
+ idle()
234
+ shadowOf(looper).idleFor(Duration.ofSeconds(31))
235
+ assertEquals(PlaybackException.ERROR_CODE_REMOTE_ERROR, player.playerError?.errorCode)
236
+
237
+ remote.endSession()
238
+ idle()
239
+
240
+ assertTrue(local.playWhenReady)
241
+ assertEquals(2, local.prepares)
242
+ }
243
+
244
+ @Test
245
+ fun `the session ending after a stop leaves the phone unprepared`() {
246
+ playLocally(listOf("a"))
247
+ remote.startSession()
248
+ idle()
249
+ player.stop()
250
+ idle()
251
+
252
+ remote.endSession()
253
+ idle()
254
+
255
+ assertEquals(1, local.prepares)
256
+ }
257
+
152
258
  @Test
153
259
  fun `the receiver's end plays the next item from its start`() {
154
260
  playLocally(listOf("a", "b"), positionMs = 4_000)
@@ -812,4 +918,9 @@ class RemoteSwitchingPlayerTest {
812
918
  androidx.media3.common.MediaMetadata.Builder().setTitle(title).build()
813
919
 
814
920
  private fun idle() = shadowOf(looper).idle()
921
+
922
+ private companion object {
923
+ val LIVE: MediaItem.LiveConfiguration =
924
+ MediaItem.LiveConfiguration.Builder().setTargetOffsetMs(5_000).build()
925
+ }
815
926
  }
@@ -4,7 +4,6 @@ import org.junit.Assert.assertEquals
4
4
  import org.junit.Assert.assertNull
5
5
  import org.junit.Test
6
6
 
7
- /** Parsing a Sonos `device_description.xml` into a [SonosDevice] with absolute control URLs. */
8
7
  class DeviceDescriptionParserTest {
9
8
 
10
9
  private fun fixture(name: String): String = javaClass.getResource("/sonos/$name")!!.readText()
@@ -15,7 +14,7 @@ class DeviceDescriptionParserTest {
15
14
  fun `parses udn, name and resolves nested control URLs against the base`() {
16
15
  val device = DeviceDescriptionParser.parse(fixture("device_description.xml"), location)!!
17
16
  assertEquals("uuid:RINCON_949F3EC213E001400", device.udn)
18
- // AVTransport + GroupRenderingControl live on the embedded MediaRenderer, not the root device.
17
+ // Both services live on the embedded MediaRenderer, not the root device.
19
18
  assertEquals(
20
19
  "http://192.168.1.50:1400/MediaRenderer/AVTransport/Control",
21
20
  device.avTransportControlUrl,
@@ -117,7 +116,6 @@ class DeviceDescriptionParserTest {
117
116
  </root>
118
117
  """
119
118
  .trimIndent()
120
- // Description was retrieved from .50 but URLBase points control at .99.
121
119
  val device = DeviceDescriptionParser.parse(xml, location)!!
122
120
  assertEquals("http://10.0.0.99:1400/AVT/Control", device.avTransportControlUrl)
123
121
  assertEquals("http://10.0.0.99:1400/RC/Control", device.groupRenderingControlUrl)
@@ -3,7 +3,6 @@ package com.audiobrowser.sonos
3
3
  import org.junit.Assert.assertEquals
4
4
  import org.junit.Test
5
5
 
6
- /** Deterministic DIDL-Lite metadata for `SetAVTransportURI`. */
7
6
  class DidlLiteTest {
8
7
 
9
8
  private val header =
@@ -10,9 +10,6 @@ import org.junit.Assert.assertTrue
10
10
  import org.junit.Before
11
11
  import org.junit.Test
12
12
 
13
- /**
14
- * Real HTTP round-trip for [SoapClient] using a local MockWebServer in place of a Sonos speaker.
15
- */
16
13
  class SoapClientTest {
17
14
 
18
15
  private lateinit var server: MockWebServer
@@ -3,7 +3,6 @@ package com.audiobrowser.sonos
3
3
  import org.junit.Assert.assertEquals
4
4
  import org.junit.Test
5
5
 
6
- /** Byte-exact SOAP request bodies + SOAPAction headers for the UPnP actions we issue. */
7
6
  class SoapEnvelopesTest {
8
7
 
9
8
  private val avt = "urn:schemas-upnp-org:service:AVTransport:1"
@@ -4,7 +4,6 @@ import org.junit.Assert.assertEquals
4
4
  import org.junit.Assert.assertNull
5
5
  import org.junit.Test
6
6
 
7
- /** Parsing UPnP SOAP responses: transport state, volume, and faults. */
8
7
  class SoapResponseParserTest {
9
8
 
10
9
  private fun transportInfo(state: String): String =
@@ -94,6 +94,7 @@ class SonosDiscovererTest {
94
94
  fun `asks one speaker for the topology, however many answered the search`() {
95
95
  topologyResponse = topology("RINCON_A" to "Dining Room")
96
96
 
97
+ // Three locations of the one mock speaker, which the discoverer takes for three speakers.
97
98
  SonosDiscoverer(OkHttpClient(), scannerReturning(location, "$location?b", "$location?c"))
98
99
  .discover()
99
100
 
@@ -123,6 +124,7 @@ class SonosDiscovererTest {
123
124
  override fun dispatch(request: RecordedRequest): MockResponse =
124
125
  when (request.requestUrl?.encodedPath) {
125
126
  "/xml/device_description.xml" ->
127
+ // The fixture's speaker as RINCON_H, the member its topology marks hidden.
126
128
  MockResponse().setBody(sonosXml.replace("RINCON_949F3EC213E001400", "RINCON_H"))
127
129
  "/ZoneGroupTopology/Control" -> envelope(hiddenTopology)
128
130
  else -> MockResponse().setResponseCode(404)
@@ -130,7 +130,6 @@ class SonosPlayerTest {
130
130
  live = false,
131
131
  )
132
132
 
133
- /** Runs the commands and one poll. */
134
133
  private fun settle() {
135
134
  scope.runCurrent()
136
135
  shadowOf(Looper.getMainLooper()).idle()
@@ -110,7 +110,7 @@ class SonosRemoteTest {
110
110
  assertEquals(emptyList<Boolean>(), sessions)
111
111
  }
112
112
 
113
- /** Commands run on a background thread. */
113
+ /** Polls, since commands run on a background thread that idling the main looper doesn't reach. */
114
114
  private fun idleUntil(what: String, condition: () -> Boolean) {
115
115
  repeat(200) {
116
116
  shadowOf(Looper.getMainLooper()).idle()
@@ -75,6 +75,7 @@ class SonosRoutesTest {
75
75
  val routes =
76
76
  sonosRouteDescriptors(listOf(dining, living), null) { mapOf("RINCON_C" to 12)[it] }.routes
77
77
 
78
+ // A room whose volume is not yet known reports 0.
78
79
  assertEquals(listOf(0, 12), routes.map { it.volume })
79
80
  assertEquals(MediaRouter.RouteInfo.PLAYBACK_VOLUME_VARIABLE, routes[0].volumeHandling)
80
81
  assertEquals(100, routes[0].volumeMax)
@@ -112,6 +113,7 @@ class SonosRoutesTest {
112
113
  }
113
114
 
114
115
  assertNull(SonosOutputs.selected)
116
+ // Once for the select, once for the unselect.
115
117
  assertEquals(2, calls)
116
118
  }
117
119
 
@@ -9,10 +9,6 @@ import org.junit.Assert.assertThrows
9
9
  import org.junit.Before
10
10
  import org.junit.Test
11
11
 
12
- /**
13
- * Command -> SOAP mapping for [SonosTransport], verified against a local MockWebServer standing in
14
- * for a Sonos speaker's control endpoints.
15
- */
16
12
  class SonosTransportTest {
17
13
 
18
14
  private lateinit var server: MockWebServer
@@ -63,12 +59,12 @@ class SonosTransportTest {
63
59
  setUri.getHeader("SOAPACTION"),
64
60
  )
65
61
  val setUriBody = setUri.body.readUtf8()
66
- // Stream URL rewritten to the Sonos radio scheme, escaped inside CurrentURI.
62
+ // A live stream goes out under Sonos's radio scheme.
67
63
  assertEquals(
68
64
  true,
69
65
  setUriBody.contains("<CurrentURI>x-rincon-mp3radio://http://ice.example/stream</CurrentURI>"),
70
66
  )
71
- // DIDL is present (double-escaped) with the title.
67
+ // The DIDL travels escaped, as text inside the envelope.
72
68
  assertEquals(true, setUriBody.contains("&lt;dc:title&gt;Jazz FM&lt;/dc:title&gt;"))
73
69
  }
74
70
 
@@ -5,7 +5,6 @@ import org.junit.Assert.assertNull
5
5
  import org.junit.Assert.assertTrue
6
6
  import org.junit.Test
7
7
 
8
- /** Byte-level build + parse of SSDP messages used for Sonos (ZonePlayer) discovery. */
9
8
  class SsdpMessagesTest {
10
9
 
11
10
  @Test
@@ -27,7 +26,6 @@ class SsdpMessagesTest {
27
26
  val text = String(SsdpMessages.buildMSearch(searchTarget = "ssdp:all", mx = 3), Charsets.UTF_8)
28
27
  assertTrue(text.contains("ST: ssdp:all\r\n"))
29
28
  assertTrue(text.contains("MX: 3\r\n"))
30
- // Always terminated by a blank line.
31
29
  assertTrue(text.endsWith("\r\n\r\n"))
32
30
  }
33
31
 
@@ -16,13 +16,8 @@ import org.mockito.Mockito.`when`
16
16
 
17
17
  class AiaCertChaserTest {
18
18
 
19
- /**
20
- * A certificate whose AIA extension value is exactly [extensionValue].
21
- *
22
- * Subject and issuer are stubbed to distinct principals on purpose: an unstubbed mock answers
23
- * null to both, which `completeChain` would read as a self-signed root and stop on before
24
- * fetching anything.
25
- */
19
+ // Subject and issuer differ on purpose: an unstubbed mock answers null to both, which
20
+ // completeChain reads as a self-signed root and stops on before fetching.
26
21
  private fun certWithAia(extensionValue: ByteArray): X509Certificate =
27
22
  mock(X509Certificate::class.java).also {
28
23
  `when`(it.getExtensionValue("1.3.6.1.5.5.7.1.1")).thenReturn(extensionValue)
@@ -30,7 +25,6 @@ class AiaCertChaserTest {
30
25
  `when`(it.issuerX500Principal).thenReturn(X500Principal("CN=issuer"))
31
26
  }
32
27
 
33
- /** A DER tag-length-value, with the length in whichever form fits. */
34
28
  private fun der(tag: Int, content: ByteArray): ByteArray {
35
29
  val length =
36
30
  when (val n = content.size) {
@@ -42,7 +36,6 @@ class AiaCertChaserTest {
42
36
  return byteArrayOf(tag.toByte()) + length + content
43
37
  }
44
38
 
45
- /** A well-formed AIA extension value listing [urls] as caIssuers locations. */
46
39
  private fun aiaExtension(urls: List<String>): ByteArray {
47
40
  val caIssuersOid = byteArrayOf(0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x02)
48
41
  val descriptions =
@@ -54,8 +47,7 @@ class AiaCertChaserTest {
54
47
 
55
48
  @Test
56
49
  fun `the AIA fixture builder round-trips through the parser`() {
57
- // Guards the two tests below: if this builder were malformed they would pass by parsing
58
- // nothing at all, rather than by the cap doing its job.
50
+ // Without this, a malformed builder would let the URL-cap tests pass by parsing nothing.
59
51
  val urls = listOf("http://ca1.example/i.crt", "http://ca2.example/i.crt")
60
52
 
61
53
  assertEquals(urls, AiaCertChaser.extractCaIssuerUrls(certWithAia(aiaExtension(urls))))
@@ -63,10 +55,8 @@ class AiaCertChaserTest {
63
55
 
64
56
  @Test(timeout = 5_000)
65
57
  fun `a negative long-form length does not hang the parser`() {
66
- // OCTET STRING { SEQUENCE { tag 0x00, long-form length 0xFFFFFFFA = -6 } }.
67
- // The length's four bytes shift into a negative Int, so `pos += len` rewinds the
68
- // reader by exactly the six bytes it just consumed: the tag is not a SEQUENCE, the
69
- // loop `continue`s, and the reader is back where it started with more input to read.
58
+ // OCTET STRING { SEQUENCE { tag 0x00, length 0xFFFFFFFA = -6 } }: as an Int the length
59
+ // rewinds the reader by the six bytes it just read, back to the start.
70
60
  val aia =
71
61
  byteArrayOf(
72
62
  0x04,
@@ -86,7 +76,7 @@ class AiaCertChaserTest {
86
76
 
87
77
  @Test(timeout = 5_000)
88
78
  fun `a length running past the buffer is treated as no AIA`() {
89
- // SEQUENCE claiming 0x7F content bytes inside a 2-byte buffer.
79
+ // A SEQUENCE claiming 0x7F content bytes inside a 2-byte buffer.
90
80
  val aia = byteArrayOf(0x04, 0x04, 0x30, 0x02, 0x30, 0x7F)
91
81
 
92
82
  assertEquals(emptyList<String>(), AiaCertChaser.extractCaIssuerUrls(certWithAia(aia)))
@@ -112,7 +102,6 @@ class AiaCertChaserTest {
112
102
  fun `completeChain appends fetched intermediate when server sends leaf only`() {
113
103
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
114
104
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
115
- // Fetcher knows only the R13 URL (the leaf's AIA pointer); empty for the root URL.
116
105
  val fetch = { url: String, _: Long ->
117
106
  if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
118
107
  }
@@ -126,9 +115,8 @@ class AiaCertChaserTest {
126
115
  fun `completeChain selects the real issuer from a multi-certificate response`() {
127
116
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
128
117
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
129
- val unrelated = CertFixtures.cert("isrg-root-x1.pem") // not the leaf's issuer
118
+ val unrelated = CertFixtures.cert("isrg-root-x1.pem")
130
119
 
131
- // A PKCS#7-style bundle where the genuine issuer is not first must still be selected.
132
120
  val completed =
133
121
  AiaCertChaser.completeChain(listOf(leaf)) { url, _ ->
134
122
  if (url == "http://r13.i.lencr.org/") listOf(unrelated, r13) else emptyList()
@@ -159,8 +147,7 @@ class AiaCertChaserTest {
159
147
  val root = CertFixtures.cert("isrg-root-x1.pem")
160
148
  val fetched = mutableListOf<String>()
161
149
 
162
- // R13's own AIA points at the ISRG root, so without knowing the anchors this walks one hop
163
- // too far and pays for a second blocking fetch on the ordinary rescue path.
150
+ // R13's AIA points at the root, so without the anchors this fetches a second time.
164
151
  val completed =
165
152
  AiaCertChaser.completeChain(
166
153
  listOf(leaf),
@@ -181,8 +168,7 @@ class AiaCertChaserTest {
181
168
  val root = CertFixtures.cert("isrg-root-x1.pem")
182
169
  var fetches = 0
183
170
 
184
- // The shape of every non-path failure — expiry, hostname mismatch, CT — where the server
185
- // sent a complete chain and validation failed for some other reason.
171
+ // A complete chain, as with any failure that is not a missing intermediate.
186
172
  val completed =
187
173
  AiaCertChaser.completeChain(
188
174
  listOf(leaf, r13),
@@ -198,9 +184,6 @@ class AiaCertChaserTest {
198
184
 
199
185
  @Test
200
186
  fun `completeChain tries only a few of a certificate's CA-Issuers URLs`() {
201
- // The extension is authored by the server that just failed validation, and nothing limits
202
- // how many URLs it lists. Each one costs a blocking connect on the handshake thread, so
203
- // hundreds of them are a denial of service whatever each individual fetch costs.
204
187
  val manyUrls = (1..500).map { "http://ca$it.example/issuer.crt" }
205
188
  val cert = certWithAia(aiaExtension(manyUrls))
206
189
  val fetched = mutableListOf<String>()
@@ -215,8 +198,6 @@ class AiaCertChaserTest {
215
198
 
216
199
  @Test
217
200
  fun `duplicate CA-Issuers URLs do not consume the URL cap`() {
218
- // 500 copies of one dead URL followed by a distinct one: the cap must buy distinct hosts,
219
- // not three visits to the same dead one.
220
201
  val urls = List(500) { "http://ca.example/issuer.crt" } + "http://ca-b.example/issuer.crt"
221
202
  val cert = certWithAia(aiaExtension(urls))
222
203
  val fetched = mutableListOf<String>()
@@ -236,8 +217,7 @@ class AiaCertChaserTest {
236
217
  var nanos = 0L
237
218
  val deadlines = mutableListOf<Long>()
238
219
 
239
- // Each fetch "takes" 8s against a 20s budget, so the walk must stop after a handful even
240
- // though the URL cap alone would have allowed more.
220
+ // Each fetch takes 8s of a 20s budget, so the budget, not the URL cap, stops it at three.
241
221
  AiaCertChaser.completeChain(
242
222
  listOf(cert),
243
223
  maxUrlsPerCert = 500,
@@ -251,8 +231,6 @@ class AiaCertChaserTest {
251
231
  }
252
232
 
253
233
  assertEquals(3, fetches)
254
- // Every fetch is handed the same walk-wide deadline, so it can clip its own I/O to it —
255
- // the budget bounds the fetches themselves, not just how many of them start.
256
234
  assertEquals(listOf(20_000_000_000L, 20_000_000_000L, 20_000_000_000L), deadlines)
257
235
  }
258
236
 
@@ -270,21 +248,19 @@ class AiaCertChaserTest {
270
248
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
271
249
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
272
250
  val root = CertFixtures.cert("isrg-root-x1.pem")
273
- // Validate as of just after issuance so the fixtures never rot when the leaf expires.
251
+ // As of just after issuance, so the test still passes once the leaf expires.
274
252
  val date = Date(leaf.notBefore.time + 86_400_000L)
275
253
 
276
- // Reproduces the Android bug: the server-sent leaf alone has no path to the trusted root.
277
254
  assertThrows(CertPathValidatorException::class.java) { validatePath(listOf(leaf), root, date) }
278
255
 
279
- // After AIA chasing splices in R13, the chain validates to the trusted root.
280
256
  val completed =
281
257
  AiaCertChaser.completeChain(listOf(leaf)) { url, _ ->
282
258
  if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
283
259
  }
284
- validatePath(completed, root, date) // must not throw
260
+ validatePath(completed, root, date)
285
261
  }
286
262
 
287
- /** Validates [chain] (leaf-first, excluding the anchor) against [anchor] as of [date]. */
263
+ /** Validates [chain] (leaf first, anchor excluded) against [anchor] as of [date]. */
288
264
  private fun validatePath(chain: List<X509Certificate>, anchor: X509Certificate, date: Date) {
289
265
  val path = CertificateFactory.getInstance("X.509").generateCertPath(chain)
290
266
  val params =
@@ -12,7 +12,7 @@ import org.junit.Test
12
12
 
13
13
  class AiaChasingTrustManagerTest {
14
14
 
15
- /** Records every chain it is asked to validate; trusts only chains of [trustsChainOfSize]. */
15
+ /** Records the size of every chain it checks; trusts only chains of [trustsChainOfSize]. */
16
16
  private class FakeDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
17
17
  val checkedChainSizes = mutableListOf<Int>()
18
18
 
@@ -38,8 +38,6 @@ class AiaChasingTrustManagerTest {
38
38
  if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
39
39
  }
40
40
 
41
- // Must not throw: the leaf-only chain is rejected, AIA fills in R13, the [leaf, R13] chain
42
- // passes.
43
41
  tm.checkServerTrusted(arrayOf(leaf), "RSA")
44
42
 
45
43
  assertEquals(listOf(1, 2), delegate.checkedChainSizes)
@@ -53,7 +51,7 @@ class AiaChasingTrustManagerTest {
53
51
 
54
52
  assertThrows(CertificateException::class.java) { tm.checkServerTrusted(arrayOf(leaf), "RSA") }
55
53
 
56
- // Only the original short chain was checked; no pointless re-validation of an unchanged chain.
54
+ // The unchanged chain is not checked a second time.
57
55
  assertEquals(listOf(1), delegate.checkedChainSizes)
58
56
  }
59
57
 
@@ -78,7 +76,7 @@ class AiaChasingTrustManagerTest {
78
76
 
79
77
  /**
80
78
  * Stands in for Android's `RootTrustManager` under a per-domain network security config: the
81
- * hostname-aware overloads work, and the two-argument one refuses to answer at all.
79
+ * hostname-aware overloads work, and the two-argument one always throws.
82
80
  */
83
81
  private class FakeDomainConfigDelegate(private val trustsChainOfSize: Int) :
84
82
  X509ExtendedTrustManager() {
@@ -129,8 +127,7 @@ class AiaChasingTrustManagerTest {
129
127
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
130
128
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
131
129
  val root = CertFixtures.cert("isrg-root-x1.pem")
132
- // Trusts nothing — an expired chain, a hostname mismatch, a CT refusal all look like this:
133
- // the delegate rejects a chain that is not missing anything.
130
+ // Rejects a chain that lacks nothing (as for an expired leaf): r13's issuer is an anchor.
134
131
  val delegate =
135
132
  object : X509TrustManager {
136
133
  override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) =
@@ -151,8 +148,6 @@ class AiaChasingTrustManagerTest {
151
148
  tm.checkServerTrusted(arrayOf(leaf, r13), "RSA")
152
149
  }
153
150
 
154
- // Chasing could not have helped, so it must not have reached out to a host named by a
155
- // certificate that just failed validation.
156
151
  assertEquals(0, fetches)
157
152
  }
158
153
 
@@ -160,7 +155,7 @@ class AiaChasingTrustManagerTest {
160
155
  fun `the original failure is kept when the completed chain fails too`() {
161
156
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
162
157
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
163
- // Trusts no chain of any size, so the retry fails as well.
158
+ // Trusts no chain, so the retry fails too.
164
159
  val delegate = FakeDelegate(trustsChainOfSize = -1)
165
160
  val tm = AiaChasingTrustManager(delegate) { _, _ -> listOf(r13) }
166
161
 
@@ -222,7 +217,7 @@ class AiaChasingTrustManagerTest {
222
217
  assertEquals(3, clientChecks)
223
218
  }
224
219
 
225
- /** A delegate carrying the Android-specific hostname-aware method, as `RootTrustManager` does. */
220
+ /** Carries the Android-specific hostname-aware method, as `RootTrustManager` does. */
226
221
  @Suppress("unused")
227
222
  private class HostAwareDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
228
223
  val hosts = mutableListOf<String>()
@@ -257,7 +252,7 @@ class AiaChasingTrustManagerTest {
257
252
  if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
258
253
  }
259
254
 
260
- // The method X509TrustManagerExtensions looks up reflectively must exist on the wrapper...
255
+ // X509TrustManagerExtensions looks this up reflectively and needs it to return a List.
261
256
  val method =
262
257
  tm.javaClass.getMethod(
263
258
  "checkServerTrusted",
@@ -266,10 +261,10 @@ class AiaChasingTrustManagerTest {
266
261
  String::class.java,
267
262
  )
268
263
 
269
- // ...and must reach the delegate's own host-aware method, so pinning still sees the host.
270
264
  val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
271
265
 
272
266
  assertEquals(listOf(leaf, r13), accepted)
267
+ // Once for the presented chain, once for the completed one.
273
268
  assertEquals(listOf("ca.example", "ca.example"), delegate.hosts)
274
269
  assertEquals(List::class.java, method.returnType)
275
270
  }
@@ -278,9 +273,6 @@ class AiaChasingTrustManagerTest {
278
273
  fun `the host-aware signature falls back to the extended overloads when the delegate lacks it`() {
279
274
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
280
275
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
281
- // An extended delegate without the Android-specific String-host method, whose two-argument
282
- // form refuses outright — the domain-config case. The fallback must route through its
283
- // extended overloads, and must report the AIA-completed chain that actually validated.
284
276
  val delegate = FakeDomainConfigDelegate(trustsChainOfSize = 2)
285
277
  val tm =
286
278
  AiaChasingExtendedTrustManager(delegate) { url, _ ->
@@ -293,7 +285,7 @@ class AiaChasingTrustManagerTest {
293
285
  assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
294
286
  }
295
287
 
296
- /** A host-aware delegate that validates fine but reports an empty accepted chain. */
288
+ /** Validates fine but reports an empty accepted chain. */
297
289
  @Suppress("unused")
298
290
  private class SilentHostAwareDelegate(private val trustsChainOfSize: Int) : X509TrustManager {
299
291
  fun checkServerTrusted(
@@ -325,8 +317,6 @@ class AiaChasingTrustManagerTest {
325
317
  if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
326
318
  }
327
319
 
328
- // An empty list from the delegate on success must not be passed through: the checked chain
329
- // is what it accepted, and a pinning consumer given [] would fail a valid connection.
330
320
  val accepted = tm.checkServerTrusted(arrayOf(leaf), "RSA", "ca.example")
331
321
 
332
322
  assertEquals(listOf(leaf, r13), accepted)
@@ -342,9 +332,6 @@ class AiaChasingTrustManagerTest {
342
332
  if (url == "http://r13.i.lencr.org/") listOf(r13) else emptyList()
343
333
  }
344
334
 
345
- // The socket overload must reach the delegate's socket overload. Routing it through the
346
- // two-argument form instead would throw the domain-config refusal, which is what a plain
347
- // X509TrustManager wrapper causes for every connection in the process.
348
335
  tm.checkServerTrusted(arrayOf(leaf), "RSA", null as Socket?)
349
336
 
350
337
  assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
@@ -380,7 +367,7 @@ class AiaChasingTrustManagerTest {
380
367
  fun `the extended variant does not weaken trust`() {
381
368
  val leaf = CertFixtures.cert("stationplaylist-leaf.pem")
382
369
  val r13 = CertFixtures.cert("letsencrypt-r13.pem")
383
- // Trusts nothing, whatever the chain.
370
+ // Trusts no chain.
384
371
  val delegate = FakeDomainConfigDelegate(trustsChainOfSize = -1)
385
372
  val tm = AiaChasingExtendedTrustManager(delegate) { _, _ -> listOf(r13) }
386
373
 
@@ -388,7 +375,6 @@ class AiaChasingTrustManagerTest {
388
375
  tm.checkServerTrusted(arrayOf(leaf), "RSA", null as Socket?)
389
376
  }
390
377
 
391
- // The completed chain was offered to the delegate and refused, rather than assumed good.
392
378
  assertEquals(listOf(1, 2), delegate.hostnameAwareChecks)
393
379
  }
394
380
  }