react-native-audio-browser 0.2.0-next.53 → 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 +28 -48
  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 +2 -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 +5 -1
  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 +9 -10
  156. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -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
@@ -2,6 +2,6 @@ package com.audiobrowser.player
2
2
 
3
3
  import com.margelo.nitro.audiobrowser.PlayerCapabilities
4
4
 
5
- /** Whether the favorite/like control is enabled. Opt-in: only an explicit `true` enables it. */
5
+ /** Opt-in, unlike the other capabilities: only an explicit `true` enables it. */
6
6
  val PlayerCapabilities.favoriteEnabled: Boolean
7
7
  get() = favorite == true
@@ -15,13 +15,11 @@ import com.margelo.nitro.audiobrowser.MediaRequestConfig
15
15
  import com.margelo.nitro.audiobrowser.Track
16
16
  import java.io.IOException
17
17
 
18
- // media3's configurable stuck-buffering (type-1, STUCK_BUFFERING_NO_PROGRESS) timeout. Fires only
19
- // on zero loading progress; 60s of silent non-progress is already a bad live-radio experience,
20
- // while the media3 default of 600s would mean 10 minutes of dead air. (Type-0
21
- // STUCK_BUFFERING_NOT_LOADING is a separate, uncontrollable fixed-4s check.)
18
+ // media3's no-progress stuck-buffering check (STUCK_BUFFERING_NO_PROGRESS); its 600s default
19
+ // would be ten minutes of dead air on a live stream. The not-loading check is a fixed 4s and not
20
+ // configurable.
22
21
  private const val STUCK_BUFFERING_DETECTION_TIMEOUT_MS = 60_000
23
22
 
24
- /** The engine pieces [buildPlayerEngine] constructs together for one setup() generation. */
25
23
  internal class PlayerEngine(
26
24
  val loadControl: DynamicLoadControl,
27
25
  val mediaFactory: MediaFactory,
@@ -29,9 +27,8 @@ internal class PlayerEngine(
29
27
  )
30
28
 
31
29
  /**
32
- * The buffer configuration described by the setup options. When `rebufferBuffer` is unset
33
- * (automatic), post-rebuffer playback starts at `playBuffer` and AutomaticBufferManager adjusts it;
34
- * when set, that fixed value is used. Pure — pinned by PlayerEngineFactoryTest.
30
+ * A null `rebufferBuffer` means automatic: post-rebuffer playback starts at `playBuffer` and
31
+ * AutomaticBufferManager adjusts it from there.
35
32
  */
36
33
  internal fun bufferConfig(options: PlayerSetupOptions): BufferConfig =
37
34
  BufferConfig(
@@ -43,10 +40,10 @@ internal fun bufferConfig(options: PlayerSetupOptions): BufferConfig =
43
40
  )
44
41
 
45
42
  /**
46
- * Constructs the playback engine for one `setup()` generation: load control, media factory, and the
47
- * ExoPlayer they plug into — pure construction, no lifecycle. Tearing down the previous generation,
48
- * wiring listeners/session, and everything stateful stays in [Player.setup], which provides its
49
- * mutable context through the lambdas.
43
+ * Constructs the load control, media factory and ExoPlayer for one `setup()` generation, and
44
+ * nothing else: tearing down the previous engine and wiring listeners stay with [Player.setup]. The
45
+ * lambdas run on ExoPlayer's background threads (playback and loader), never main, so they must
46
+ * read thread-safe state.
50
47
  */
51
48
  internal fun buildPlayerEngine(
52
49
  context: Context,
@@ -61,14 +58,10 @@ internal fun buildPlayerEngine(
61
58
  val renderer = DefaultRenderersFactory(context)
62
59
  renderer.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER)
63
60
 
64
- // Bandwidth meter for adaptive bitrate selection in HLS/DASH
65
61
  val bandwidthMeter = DefaultBandwidthMeter.Builder(context).build()
66
62
 
67
63
  val loadControl = DynamicLoadControl(initialConfig = bufferConfig(options))
68
64
 
69
- // shouldRetry checks playWhenReady to avoid retrying when paused (e.g., another app took audio
70
- // focus) — via a thread-safe cache since this runs on ExoPlayer's playback thread. isOnline and
71
- // onRetryPending enable network-aware retry acceleration.
72
65
  val mediaFactory =
73
66
  MediaFactory(
74
67
  context,
@@ -117,9 +110,8 @@ internal fun buildPlayerEngine(
117
110
  .setIsGaplessSupportRequired(it.gaplessSupportRequired)
118
111
  .setIsSpeedChangeSupportRequired(it.rateChangeSupportRequired)
119
112
  .build()
120
- // Assigning the public final field compiles to a putfield that throws
121
- // IllegalAccessError on ART, and mutating the getter's snapshot wouldn't
122
- // reach the selector anyway — go through the builder.
113
+ // Assigning the field directly throws IllegalAccessError on ART, and mutating the getter's
114
+ // snapshot never reaches the selector: go through the builder.
123
115
  exoPlayer.trackSelectionParameters =
124
116
  exoPlayer.trackSelectionParameters
125
117
  .buildUpon()
@@ -21,44 +21,35 @@ import com.margelo.nitro.audiobrowser.PlaybackState
21
21
  import java.util.Locale
22
22
  import timber.log.Timber
23
23
 
24
- // Continuous playback required to refill the stuck-recovery budget. Long enough that a stream which
25
- // keeps re-stalling can't "prove liveness" between stalls, short enough to forgive a single hiccup.
24
+ // Continuous playback that refills the stuck-recovery and load-retry budgets. Shorter lets a
25
+ // stream that keeps re-stalling look alive between stalls; longer stops forgiving a single hiccup.
26
26
  private const val HEALTHY_PLAYBACK_MS = 20_000L
27
27
 
28
28
  class PlayerListener(private val player: Player) : MediaPlayer.Listener {
29
- // Caps auto-recovery from media3 stuck-player detection before surfacing a terminal error.
30
29
  private val stuckRecoveryPolicy = StuckRecoveryPolicy()
31
30
 
32
- // Proof-of-life timer: the recovery budget refills only after the player sustains continuous
33
- // playback for HEALTHY_PLAYBACK_MS, proving the stream actually delivered audio (not a brief blip
34
- // before re-stalling). Mirrors AutomaticBufferManager's Handler usage. Runs on the main thread,
35
- // where Player.Listener callbacks are delivered.
31
+ // Main looper: Player.Listener callbacks arrive on the main thread.
36
32
  private val healthyPlaybackHandler = Handler(Looper.getMainLooper())
37
33
  private val healthyPlaybackRunnable =
38
34
  object : Runnable {
39
35
  override fun run() {
40
36
  stuckRecoveryPolicy.reset()
41
- // Refill the load-error retry window too — it otherwise resets only
42
- // on track change, so a second outage >2min after the first got zero
43
- // retries (instant terminal error) on a long-lived stream.
37
+ // The load-retry window otherwise restarts only on a track change, leaving a
38
+ // long-lived stream no retries for its next outage.
44
39
  player.resetRetryTimer()
45
- // Re-post while playing: errors the buffer absorbs never flip
46
- // isPlaying, so a one-shot refill left the window stale again.
40
+ // Re-arm while playing: errors the buffer absorbs never flip isPlaying.
47
41
  if (player.isPlaying) {
48
42
  healthyPlaybackHandler.postDelayed(this, HEALTHY_PLAYBACK_MS)
49
43
  }
50
44
  }
51
45
  }
52
46
 
53
- /** Called when there is metadata associated with the current playback time. */
54
47
  override fun onMetadata(metadata: Metadata) {
55
- // Extract and emit chapter metadata if present
56
48
  val chapters = MetadataAdapter.extractChapters(metadata)
57
49
  if (chapters.isNotEmpty()) {
58
50
  player.callbacks?.onChapterMetadata(chapters)
59
51
  }
60
52
 
61
- // Extract and emit timed metadata (ICY, ID3, etc.)
62
53
  PlaybackMetadata.from(metadata, player.currentTrack?.icyCharset)?.let {
63
54
  val timed = it.toNitro()
64
55
  player.callbacks?.onTimedMetadata(timed)
@@ -72,29 +63,16 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
72
63
  )
73
64
  }
74
65
 
75
- /**
76
- * A position discontinuity occurs when the playing period changes, the playback position jumps
77
- * within the period currently being played, or when the playing period has been skipped or
78
- * removed.
79
- */
80
66
  override fun onPositionDiscontinuity(
81
67
  oldPosition: MediaPlayer.PositionInfo,
82
68
  newPosition: MediaPlayer.PositionInfo,
83
69
  reason: Int,
84
70
  ) {
85
71
  player.oldPosition = oldPosition.positionMs
86
- // Position discontinuity events are not currently exposed to callbacks
87
72
  }
88
73
 
89
- /**
90
- * Called when playback transitions to a media item or starts repeating a media item according to
91
- * the current repeat mode. Note that this callback is also called when the playlist becomes
92
- * non-empty or empty as a consequence of a playlist change.
93
- */
94
74
  override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
95
75
  val lastPosition = player.oldPosition.toSeconds()
96
- // Audio item transition events are not currently exposed to callbacks
97
- // Emit active track changed event with last track info
98
76
  val event =
99
77
  PlaybackActiveTrackChangedEvent(
100
78
  lastIndex = player.lastIndex?.toDouble(),
@@ -105,42 +83,30 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
105
83
  )
106
84
  player.callbacks?.onPlaybackActiveTrackChanged(event)
107
85
 
108
- // Check if sleep timer should trigger on track end
109
86
  if (reason == MediaPlayer.MEDIA_ITEM_TRANSITION_REASON_AUTO) {
110
87
  player.sleepTimer.onTrackEnd()
111
88
  }
112
89
 
113
- // Update last track info for next transition
114
90
  player.lastTrack = player.currentTrack
115
91
  player.lastIndex = player.currentIndex
116
92
 
117
- // Update favorite button state for new track
118
93
  player.updateFavoriteButtonState(player.currentTrack?.favorited)
119
94
  player.updateLiveState(player.currentTrack?.live == true)
120
95
 
121
- // Clear now playing override when track changes (new track = clean slate)
122
96
  player.nowPlaying.clearOverride()
123
97
 
124
- // Re-stamp the now-playing metadata for the new track. The browse-list
125
- // MediaItem carries `artist = subtitle` (the per-context list line), but the
126
- // now-playing screen / lock screen / Bluetooth should show the canonical
127
- // `artist` (location). Android Auto derives both from the same MediaItem's
128
- // `artist`, so we overwrite the playing item's metadata here (the same
129
- // mechanism ICY song updates already use) to diverge it from the list items.
130
- // This also fires onNowPlayingChanged, so we don't emit it separately below.
98
+ // The browse MediaItem's artist is the list subtitle; render() restamps the playing item with
99
+ // the canonical artist for the now-playing surfaces (Android Auto reads both from that field).
100
+ // It also emits onNowPlayingChanged.
131
101
  player.nowPlaying.render()
132
102
 
133
- // Reset retry timer so the new track gets fresh duration budgets, and mark
134
- // the new load unproven — its failures get the short first-connect budget
135
- // until it renders audio.
103
+ // The new load is unproven: its failures get the short first-connect budget until it plays.
136
104
  player.resetRetryTimer()
137
105
  player.hasPlayedCache = false
138
106
 
139
- // A retrying error belongs to the outgoing track; drop it (with its own emit —
140
- // the incoming track may hold the state on LOADING/BUFFERING, emitting nothing).
107
+ // Emits on its own: the incoming track may hold LOADING/BUFFERING and emit no state change.
141
108
  player.clearRetryingError()
142
109
 
143
- // A new station starts with a clean stuck-recovery budget, mirroring the retry timer reset.
144
110
  healthyPlaybackHandler.removeCallbacks(healthyPlaybackRunnable)
145
111
  stuckRecoveryPolicy.reset()
146
112
 
@@ -148,12 +114,6 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
148
114
  player.playbackStateStore.resetPeriodicSave()
149
115
  }
150
116
 
151
- /**
152
- * Schedules a stuck-recovery budget refill once the player has been continuously playing for
153
- * [HEALTHY_PLAYBACK_MS], and cancels it the moment playback stops (pause, rebuffer, stall,
154
- * error). Sustained real playback is our proof the stream is alive and the budget can be trusted
155
- * again.
156
- */
157
117
  override fun onIsPlayingChanged(isPlaying: Boolean) {
158
118
  healthyPlaybackHandler.removeCallbacks(healthyPlaybackRunnable)
159
119
  if (isPlaying) {
@@ -161,22 +121,17 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
161
121
  }
162
122
  }
163
123
 
164
- /** Called when the value returned from Player.getPlayWhenReady() changes. */
165
124
  override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) {
166
- // An explicit pause during the sleep fade is the timer's goal arriving early: clear the
167
- // timer (restores the pre-fade volume). The timer's own completion cancels the fader
168
- // before pausing, so it never re-enters here.
125
+ // A pause during the sleep fade ends the timer early; clearing it restores the pre-fade volume.
126
+ // The timer's own completion stops the fader before pausing, so it never lands here.
169
127
  if (!playWhenReady && player.volumeFader.isActive) {
170
128
  player.sleepTimer.clear()
171
129
  }
172
130
 
173
- // Update thread-safe cache for access from non-main threads (e.g., retry policy).
174
- // Deliberately the second writer: Player.playWhenReady's setter writes eagerly so
175
- // non-main readers see the new intent before ExoPlayer round-trips; this event is
176
- // the authoritative sync for changes ExoPlayer makes on its own (e.g. audio focus).
131
+ // The second writer: Player.playWhenReady's setter writes first so loader-thread readers see
132
+ // the intent early; this syncs changes ExoPlayer makes itself (e.g. audio focus).
177
133
  player.playWhenReadyCache = playWhenReady
178
- // Through the dedupe guard: the ENDED clear in setPlaybackState already
179
- // emitted this change synchronously (ordered before queue-ended).
134
+ // Deduped: the ENDED path in setPlaybackState may already have emitted it, before queue-ended.
180
135
  player.emitPlayWhenReadyChanged(playWhenReady)
181
136
  player.refreshPlayingState()
182
137
 
@@ -191,18 +146,10 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
191
146
  player.refreshPlayingState()
192
147
  }
193
148
 
194
- /**
195
- * The generic onEvents callback provides access to the Player object and specifies the set of
196
- * events that occurred together. It's always called after the callbacks that correspond to the
197
- * individual events.
198
- */
199
149
  override fun onEvents(media3Player: MediaPlayer, events: MediaPlayer.Events) {
200
- // Note that it is necessary to set `playerState` in order, since each mutation fires an
201
- // event.
150
+ // In event order: each setPlaybackState emits.
202
151
  for (i in 0 until events.size()) {
203
- // A new item clears any prior error even when no state transition follows (e.g. the queue
204
- // was emptied) — silently, matching the pre-state-machine behavior. Kept out of the event
205
- // mapping below so that stays pure; ordering within the batch is unchanged.
152
+ // A new item clears the prior error even when no state transition follows (queue emptied).
206
153
  if (events[i] == MediaPlayer.EVENT_MEDIA_ITEM_TRANSITION) {
207
154
  player.playbackError = null
208
155
  }
@@ -210,9 +157,8 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
210
157
  val event =
211
158
  when (events[i]) {
212
159
  MediaPlayer.EVENT_PLAYBACK_STATE_CHANGED ->
213
- // Read the session player's real state, not the forwarding player's: the
214
- // InterceptingPlayer masks STATE_IDLE→READY on a terminal error, and that mask must
215
- // not feed back into our own state machine (it would clear the ERROR state/subtitle).
160
+ // The session player's state, not the forwarding player's: InterceptingPlayer masks
161
+ // IDLE as READY after a terminal error, which would clear our ERROR state here.
216
162
  PlaybackEvent.ExoPlaybackStateChanged(
217
163
  player.sessionPlayer.playbackState,
218
164
  media3Player.mediaItemCount,
@@ -237,8 +183,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
237
183
  }
238
184
 
239
185
  override fun onPlayerErrorChanged(error: PlaybackException?) {
240
- // The error clearing means a recovery path ran prepare() — a restart from
241
- // terminal error, which begins a new load (see Player.resetForNewLoad).
186
+ // Cleared means a recovery path ran prepare(), which starts a new load.
242
187
  if (error == null) player.resetForNewLoad()
243
188
  }
244
189
 
@@ -247,19 +192,16 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
247
192
  surface(error)
248
193
  }
249
194
 
250
- /** Recovers what the local engine can recover by itself; false for an error to surface. */
195
+ /** True when the local engine recovered from [error] itself; false for an error to surface. */
251
196
  private fun recoverLocally(error: PlaybackException): Boolean {
252
- // Handle live stream recovery when playback position falls behind the live window
253
197
  if (error.errorCode == PlaybackException.ERROR_CODE_BEHIND_LIVE_WINDOW) {
254
198
  Timber.d("Playback fell behind live window, recovering to live edge")
255
199
  player.localEngine.retry(toLiveEdge = true)
256
200
  return true
257
201
  }
258
202
 
259
- // media3 1.9.0+ stuck-player detection arrives here wrapped in a PlaybackException: the actual
260
- // StuckPlayerException (an IllegalStateException, not a PlaybackException) sits in the cause
261
- // chain, and the wrapper's errorCode varies by stuck type — so we detect by cause, not code.
262
- // For a live-radio app a transient stall should reconnect, not stop playback.
203
+ // media3 1.9+ stuck-player detection wraps a StuckPlayerException (not a PlaybackException) in
204
+ // the cause chain, and the wrapper's errorCode varies by stuck type: match the cause.
263
205
  val stuck =
264
206
  generateSequence(error.cause) { it.cause }
265
207
  .filterIsInstance<StuckPlayerException>()
@@ -273,9 +215,8 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
273
215
 
274
216
  private fun surface(error: PlaybackException) {
275
217
  val online = player.networkMonitor.getOnline()
276
- // `code` stays the raw ExoPlayer name for telemetry; `kind` is the normalized classification
277
- // consumers branch on. Offline is the one distinction ExoPlayer's codes cannot make on their
278
- // own, so it overrides the code name too.
218
+ // `code` keeps ExoPlayer's name for telemetry; consumers branch on the classified kind. Offline
219
+ // is the one case ExoPlayer's codes can't tell, so it overrides the code too.
279
220
  val code =
280
221
  if (!online) {
281
222
  "not-connected-to-internet"
@@ -299,14 +240,12 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
299
240
  }
300
241
 
301
242
  /**
302
- * Recovers from a media3 stuck-player detection or, once the recovery budget is exhausted,
303
- * surfaces a distinct terminal error. Live items rejoin the live edge (a stale buffered live
304
- * window is the common stuck cause); on-demand items re-prepare in place so the saved position is
305
- * preserved.
243
+ * Retries until [stuckRecoveryPolicy] gives up, then surfaces a STALLED error. Live items rejoin
244
+ * the live edge (a stale live window is the usual cause); on-demand items re-prepare in place,
245
+ * keeping their position.
306
246
  */
307
247
  private fun handleStuckPlayer(error: StuckPlayerException) {
308
- // Defensive: media3 only fires stuck detection while playWhenReady is true, but never do
309
- // recovery work for a deliberately-paused player (matches RetryLoadErrorHandlingPolicy).
248
+ // media3 detects stuck only while playWhenReady, but a paused player never gets recovery work.
310
249
  if (!player.playWhenReady) return
311
250
 
312
251
  when (stuckRecoveryPolicy.onStuck()) {
@@ -349,12 +288,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
349
288
  player.playbackStateStore.playbackSpeed = playbackParameters.speed
350
289
  }
351
290
 
352
- /**
353
- * Called when the timeline changes (playlist add/remove/reorder). We use this to emit queue
354
- * changed events to JS.
355
- */
356
291
  override fun onTimelineChanged(timeline: Timeline, reason: Int) {
357
- // Only emit for playlist changes, not initial load or other reasons
358
292
  if (reason == MediaPlayer.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED) {
359
293
  player.callbacks?.onPlaybackQueueChanged(player.tracks)
360
294
  // Replacing the current item with one of the same URL updates it in place, without a
@@ -14,34 +14,24 @@ import kotlin.math.pow
14
14
  import timber.log.Timber
15
15
 
16
16
  /**
17
- * Custom LoadErrorHandlingPolicy that retries on recoverable IO errors with exponential backoff.
17
+ * Retries recoverable load errors with exponential backoff, until one of two duration budgets runs
18
+ * out.
18
19
  *
19
- * When a network monitor is provided and the device is offline during a network error, the policy
20
- * will use a shorter retry delay and the network restoration callback can trigger an immediate
21
- * retry when connectivity is restored.
20
+ * A load that has never produced audio ([hasPlayed]) is usually a dead stream, so it gets the short
21
+ * first-connect budget, counted in online time only, so a station tapped while offline still gets
22
+ * its seconds once connectivity returns. Every load is also bounded by the full recovery budget,
23
+ * offline time included. Budgets are kept here, never through
24
+ * [LoadErrorHandlingPolicy.LoadErrorInfo.errorCount]: that counts per loadable (an HLS stream has a
25
+ * playlist and segment loadables, each counted apart), so it cannot bound a load.
22
26
  *
23
- * Two duration budgets apply, chosen by whether the current load has ever produced audio
24
- * ([hasPlayed]): a short first-connect budget — a stream that fails before ever playing is usually
25
- * dead, and the listener is actively waiting for a verdict — and the full recovery budget for a
26
- * stream that played and then dropped (tunnels, handovers, encoder restarts). The short budget
27
- * counts only online time, so a station tapped in a tunnel still gets its online seconds once
28
- * connectivity returns. Both budgets are enforced here at the policy level, never via ExoPlayer's
29
- * [LoadErrorHandlingPolicy.LoadErrorInfo.errorCount] — that counts per *loadable* (an HLS stream
30
- * has playlist and segment loadables, each with its own count), so it cannot express a per-load
31
- * promise.
32
- *
33
- * @param maxRetries Maximum number of retries, or null for infinite retries
34
- * @param maxRetryDurationMs Maximum duration to keep retrying before giving up, or null for default
35
- * (2 minutes)
36
- * @param firstConnectMaxRetryDurationMs Maximum duration to keep retrying a load that has never
37
- * produced audio, while online, or null for default (12 seconds)
38
- * @param shouldRetry Optional callback to check if retry should proceed (e.g., check playWhenReady)
39
- * @param isOnline Optional callback to check current network state
40
- * @param hasPlayed Optional callback: whether the current load has produced audio. Must be safe to
41
- * call from ExoPlayer's loader thread (e.g. backed by a volatile cache).
42
- * @param onRetryPending Optional callback invoked when a retry is pending, with the load error
43
- * being retried (for surfacing it while the retry runs, and for network restoration
44
- * acceleration). Invoked on ExoPlayer's loader thread.
27
+ * @param maxRetries the most retries per loadable; null for no limit
28
+ * @param maxRetryDurationMs the full recovery budget; null for 2 minutes
29
+ * @param firstConnectMaxRetryDurationMs the online budget of a load that has never produced audio;
30
+ * null for 12 seconds
31
+ * @param shouldRetry false gives up at once (e.g. the player is paused)
32
+ * @param hasPlayed whether the current load has produced audio; called on ExoPlayer's loader thread
33
+ * @param onRetryPending called on ExoPlayer's loader thread each time a retry is scheduled, with
34
+ * the error being retried
45
35
  */
46
36
  class RetryLoadErrorHandlingPolicy(
47
37
  private val maxRetries: Int? = null,
@@ -54,57 +44,38 @@ class RetryLoadErrorHandlingPolicy(
54
44
  ) : DefaultLoadErrorHandlingPolicy() {
55
45
 
56
46
  companion object {
57
- private const val INITIAL_RETRY_DELAY_MS = 1000L // 1 second
58
- private const val MAX_RETRY_DELAY_MS = 5000L // 5 seconds cap
47
+ private const val INITIAL_RETRY_DELAY_MS = 1000L
48
+ private const val MAX_RETRY_DELAY_MS = 5000L
59
49
  private const val BACKOFF_MULTIPLIER = 1.5
60
- // When offline, use a short fixed delay instead of exponential backoff.
61
- // ExoPlayer's retry timer can't be interrupted, so we use a short delay to:
62
- // 1. Allow our network restoration callback to trigger immediate retry
63
- // 2. Keep polling in case the callback doesn't fire
50
+ // Fixed while offline: ExoPlayer's retry timer can't be interrupted, so a short delay lets the
51
+ // retry fired on network restoration land soon, and keeps polling if that never fires.
64
52
  private const val OFFLINE_RETRY_DELAY_MS = 1000L
65
- // Default maximum duration to keep retrying before giving up (in milliseconds).
66
- private const val DEFAULT_MAX_RETRY_DURATION_MS = 120_000L // 2 minutes
67
- // Default maximum duration for a load that has never produced audio, while online.
53
+ private const val DEFAULT_MAX_RETRY_DURATION_MS = 120_000L
68
54
  private const val DEFAULT_FIRST_CONNECT_MAX_RETRY_DURATION_MS = 12_000L
69
55
 
70
- // HTTP status codes that are worth retrying
71
- private val RETRYABLE_HTTP_STATUS_CODES =
72
- setOf(
73
- 408, // Request Timeout
74
- 429, // Too Many Requests
75
- 500, // Internal Server Error
76
- 502, // Bad Gateway
77
- 503, // Service Unavailable
78
- 504, // Gateway Timeout
79
- )
56
+ private val RETRYABLE_HTTP_STATUS_CODES = setOf(408, 429, 500, 502, 503, 504)
80
57
  }
81
58
 
82
- // Maximum duration to keep retrying before giving up.
83
- // This prevents surprising playback resumption after long periods offline.
59
+ // Stops playback resuming by surprise after a long time offline.
84
60
  private val maxRetryDurationMs: Long = maxRetryDurationMs ?: DEFAULT_MAX_RETRY_DURATION_MS
85
61
 
86
62
  private val firstConnectMaxRetryDurationMs: Long =
87
63
  firstConnectMaxRetryDurationMs ?: DEFAULT_FIRST_CONNECT_MAX_RETRY_DURATION_MS
88
64
 
89
- // Track when we started retrying to enforce max duration
65
+ // Written on ExoPlayer's loader thread, reset from the main thread.
90
66
  @Volatile private var firstErrorTime: Long? = null
91
67
 
92
- // First error observed while online — the first-connect budget's clock. Never set while
93
- // offline, and wiped by any offline observation, so an offline stretch cannot burn the short
94
- // budget: the clock restarts at the next error observed online.
68
+ // The first-connect budget's clock: set at the first error seen online and wiped by any seen
69
+ // offline, so an offline stretch never burns it.
95
70
  @Volatile private var firstOnlineErrorTime: Long? = null
96
71
 
97
- /** Resets the retry timer. Call when track changes. */
72
+ /** Restarts both budgets: call when a new load begins, or once playback has proven healthy. */
98
73
  fun reset() {
99
74
  firstErrorTime = null
100
75
  firstOnlineErrorTime = null
101
76
  }
102
77
 
103
- /**
104
- * The name of the exhausted budget, or null while budget remains. The recovery duration bounds
105
- * everything (including offline waits); the first-connect duration additionally bounds
106
- * never-played loads, online only.
107
- */
78
+ /** The name of the exhausted budget, or null while both have time left. */
108
79
  private fun exhaustedBudget(currentTime: Long): String? {
109
80
  firstErrorTime?.let { start ->
110
81
  if (currentTime - start >= maxRetryDurationMs)
@@ -120,9 +91,8 @@ class RetryLoadErrorHandlingPolicy(
120
91
  return null
121
92
  }
122
93
 
123
- /** Calculates exponential backoff delay: 1s -> 1.5s -> 2.3s -> 3.4s -> 5s (capped) */
94
+ /** 1s, 1.5s, 2.25s, ... capped at [MAX_RETRY_DELAY_MS]; [errorCount] is 1-based. */
124
95
  private fun calculateBackoffDelay(errorCount: Int): Long {
125
- // errorCount is 1-based (first error = 1)
126
96
  val exponentialDelay =
127
97
  INITIAL_RETRY_DELAY_MS * BACKOFF_MULTIPLIER.pow((errorCount - 1).toDouble())
128
98
  return min(exponentialDelay.toLong(), MAX_RETRY_DELAY_MS)
@@ -133,49 +103,38 @@ class RetryLoadErrorHandlingPolicy(
133
103
  val errorCount = loadErrorInfo.errorCount
134
104
  val currentTime = System.currentTimeMillis()
135
105
 
136
- // Don't retry if player is paused/stopped (e.g., another app took audio focus)
137
106
  if (!shouldRetry()) {
138
107
  Timber.d("Retry skipped: shouldRetry() returned false (player likely paused)")
139
108
  return C.TIME_UNSET
140
109
  }
141
110
 
142
- // Check if we've exceeded max retries
143
111
  if (maxRetries != null && errorCount > maxRetries) {
144
112
  Timber.d("Max retries ($maxRetries) exceeded, not retrying")
145
113
  return C.TIME_UNSET
146
114
  }
147
115
 
148
- // Track when we started retrying
149
116
  if (firstErrorTime == null) {
150
117
  firstErrorTime = currentTime
151
118
  }
152
119
  if (isOnline()) {
153
120
  if (firstOnlineErrorTime == null) firstOnlineErrorTime = currentTime
154
121
  } else {
155
- // Seeing the device offline restarts the first-connect clock: a station that lost
156
- // connectivity mid-budget gets its full online seconds again after restoration,
157
- // instead of the offline gap counting against it.
158
122
  firstOnlineErrorTime = null
159
123
  }
160
124
 
161
- // Check if we've been retrying too long (prevents surprising resumption after long
162
- // offline periods, and grants dead-on-arrival streams a fast verdict)
163
125
  exhaustedBudget(currentTime)?.let { budget ->
164
126
  Timber.d("$budget exceeded, giving up")
165
127
  return C.TIME_UNSET
166
128
  }
167
129
 
168
- // Classify the error
169
130
  val errorClassification = classifyError(exception)
170
131
 
171
132
  return if (errorClassification.isRecoverable) {
172
- // Check if we're offline during a network error
173
133
  val currentlyOffline = !isOnline()
174
134
  val isNetworkError = errorClassification.isNetworkError
175
135
 
176
136
  val delay =
177
137
  if (currentlyOffline && isNetworkError) {
178
- // Use shorter delay when offline - we'll retry immediately when network comes back
179
138
  Timber.d(
180
139
  "Device is offline, using short retry delay (will accelerate when network returns)"
181
140
  )
@@ -188,32 +147,23 @@ class RetryLoadErrorHandlingPolicy(
188
147
  "Retrying after IO error (attempt $errorCount, delay ${delay}ms, offline=$currentlyOffline): ${exception.message}"
189
148
  )
190
149
 
191
- // Notify that a retry is pending (for network restoration acceleration)
192
150
  onRetryPending?.invoke(exception, isNetworkError)
193
151
 
194
152
  delay
195
153
  } else {
196
- // Non-recoverable error: stop now. We can't delegate to super here —
197
- // DefaultLoadErrorHandlingPolicy still schedules a backoff retry for some errors it doesn't
198
- // consider fatal (e.g. a 404 InvalidResponseCodeException), which combined with our infinite
199
- // getMinimumLoadableRetryCount would retry a dead URL until the max-retry-duration timeout.
154
+ // Not super's verdict: it still backs off on some errors it doesn't treat as fatal (a 404),
155
+ // which with the unbounded getMinimumLoadableRetryCount would retry a dead URL for the whole
156
+ // budget.
200
157
  C.TIME_UNSET
201
158
  }
202
159
  }
203
160
 
204
- /** Classification result for an error */
205
161
  private data class ErrorClassification(val isRecoverable: Boolean, val isNetworkError: Boolean)
206
162
 
207
163
  /**
208
- * Classifies whether an error is recoverable and whether it's network-related.
209
- *
210
- * Load errors are delivered as a raw [IOException] (e.g.
211
- * [HttpDataSource.HttpDataSourceException], `UnknownHostException`, `SocketTimeoutException`) —
212
- * never as a `PlaybackException`, which is only surfaced at the player level *after* retries are
213
- * exhausted. So we classify by walking the IOException cause chain. This is essential: a plain
214
- * Wi-Fi drop surfaces as a socket/DNS IOException, and unless we flag it as a network error the
215
- * connectivity-restoration path can't fire an immediate retry, leaving playback stuck buffering
216
- * until it returns.
164
+ * Walks the cause chain: load errors arrive as raw IOExceptions (a Wi-Fi drop is a socket or DNS
165
+ * error), never as a PlaybackException. Anything not known to be fatal counts as a network error,
166
+ * so connectivity restoration can retry it at once.
217
167
  */
218
168
  private fun classifyError(exception: IOException): ErrorClassification {
219
169
  val nonRecoverable = ErrorClassification(isRecoverable = false, isNetworkError = false)
@@ -221,14 +171,11 @@ class RetryLoadErrorHandlingPolicy(
221
171
  var current: Throwable? = exception
222
172
  while (current != null) {
223
173
  when (current) {
224
- // HTTP responses: only retry server errors (5xx) and specific client errors (408, 429).
225
- // Other status codes (e.g. 403/404) will never succeed on retry.
226
174
  is HttpDataSource.InvalidResponseCodeException -> {
227
175
  val retryable = current.responseCode in RETRYABLE_HTTP_STATUS_CODES
228
176
  return ErrorClassification(isRecoverable = retryable, isNetworkError = retryable)
229
177
  }
230
- // Errors that retrying cannot fix — mirror DefaultLoadErrorHandlingPolicy's
231
- // non-retryable set so we don't spin until the max-retry-duration timeout.
178
+ // Mirrors DefaultLoadErrorHandlingPolicy's fatal set.
232
179
  is HttpDataSource.CleartextNotPermittedException,
233
180
  is ParserException,
234
181
  is FileNotFoundException,
@@ -237,20 +184,17 @@ class RetryLoadErrorHandlingPolicy(
237
184
  current = current.cause
238
185
  }
239
186
 
240
- // A read at a position the source can no longer provide (e.g. behind a live window) won't
241
- // recover via an in-place loader retry.
187
+ // A position the source can no longer serve (e.g. behind a live window) won't come back on an
188
+ // in-place retry.
242
189
  if (DataSourceException.isCausedByPositionOutOfRange(exception)) {
243
190
  return nonRecoverable
244
191
  }
245
192
 
246
- // Any other IOException is a transient network/transport failure (connection reset, DNS
247
- // failure, socket timeout, network interface lost, ...): recoverable, and flagged as a network
248
- // error so connectivity restoration can trigger an immediate retry.
249
193
  return ErrorClassification(isRecoverable = true, isNetworkError = true)
250
194
  }
251
195
 
252
196
  override fun getMinimumLoadableRetryCount(dataType: Int): Int {
253
- // Return the max retries, or MAX_VALUE for infinite
197
+ // Unbounded by default: the duration budgets decide when to stop.
254
198
  return maxRetries ?: Int.MAX_VALUE
255
199
  }
256
200
  }