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
@@ -1,31 +1,24 @@
1
1
  import Foundation
2
2
 
3
- /// Whether an `AVPlayerItemDidPlayToEndTime` notification represents a genuine
4
- /// end of the track, or a stall masquerading as one.
5
3
  enum EndOfTrackOutcome: Equatable {
6
- /// Genuine end — advance the queue / complete.
7
4
  case ended
8
- /// Not a real end (a dropped live stream, or a mid-stream buffer exhaustion
9
- /// reported as EOF) — recover instead of advancing.
5
+ /// A stall reported as an end: recover rather than advance.
10
6
  case stalled
11
7
  }
12
8
 
13
- /// Pure decision for how to treat an end-of-item notification, kept free of
14
- /// AVFoundation so it can be unit-tested off-device. iOS surfaces a dropped
15
- /// connection on a live stream — and sometimes a mid-stream buffer underrun —
16
- /// as a "played to end", which would otherwise stop the station or skip the
17
- /// track.
9
+ /// Judges an `AVPlayerItemDidPlayToEndTime`: iOS reports a dropped live connection, and
10
+ /// sometimes a mid-stream buffer underrun, as a played-to-end, which would stop the station or
11
+ /// skip the track. Free of AVFoundation so it tests off-device.
18
12
  struct EndOfTrackJudgement {
19
13
  let isLive: Bool
20
14
  let currentTime: Double
21
15
  let duration: Double
22
16
 
23
17
  var outcome: EndOfTrackOutcome {
24
- // Live streams are infinite; an end-of-item here is a dropped connection.
25
18
  if isLive { return .stalled }
26
- // Indefinite/unknown duration — can't validate the position, trust iOS.
19
+ // No known duration to check the position against: trust iOS.
27
20
  guard duration.isFinite, duration > 0 else { return .ended }
28
- // More than 5% short of the end → a stall reported as EOF, not a real finish.
21
+ // More than 5% short of the end is a stall, not a finish.
29
22
  if currentTime + duration * 0.05 < duration { return .stalled }
30
23
  return .ended
31
24
  }
@@ -2,12 +2,13 @@
2
2
  import NitroModules
3
3
  #endif
4
4
 
5
- /// The player's error: none, one the retry loop is still working on (shown over a non-terminal
6
- /// state, an Advisory error), or terminal (the `.error` state).
5
+ /// The player's error: none, one the retry loop is still working on (an advisory error, shown
6
+ /// over a loading, buffering or paused state), or terminal (the `.error` state).
7
7
  enum ErrorStatus: Equatable {
8
8
  case none
9
9
  case retrying(TrackPlayerError.PlaybackError)
10
- /// `report` tells each terminal report from the last, so a repeat of the same error is a change.
10
+ /// `report` counts terminal reports, so a repeat of the same error still compares as a change
11
+ /// and is published again.
11
12
  case terminal(TrackPlayerError.PlaybackError, report: UInt)
12
13
 
13
14
  var error: TrackPlayerError.PlaybackError? {
@@ -21,13 +22,13 @@ enum ErrorStatus: Equatable {
21
22
  if case .retrying = self { true } else { false }
22
23
  }
23
24
 
24
- /// The JS-facing error, carrying the retrying flag.
25
25
  var nitroError: PlaybackError? {
26
26
  error?.toNitroError(retrying: isRetrying)
27
27
  }
28
28
 
29
29
  /// The status once `event` moves the state from `old` to `new`: an error event is a new
30
- /// terminal report; leaving `.error`, or reaching a state without an advisory error, clears it.
30
+ /// terminal report; leaving `.error` clears it, and so does a retrying error reaching a state
31
+ /// that carries no advisory error.
31
32
  func after(event: PlaybackEvent, from old: PlaybackState, to new: PlaybackState) -> ErrorStatus {
32
33
  if case let .errorOccurred(error) = event {
33
34
  return .terminal(error, report: terminalReport &+ 1)
@@ -42,8 +43,8 @@ enum ErrorStatus: Equatable {
42
43
  }
43
44
 
44
45
  extension PlaybackState {
45
- /// Whether a retrying error shows over this state: the listener is waiting on it, and no audio
46
- /// is playing to contradict it.
46
+ /// Whether a retrying error shows over this state: the listener is waiting, and no audio plays
47
+ /// to contradict it.
47
48
  var carriesAdvisoryError: Bool {
48
49
  self == .loading || self == .buffering || self == .paused
49
50
  }
@@ -12,28 +12,26 @@ struct MediaResolvedUrl {
12
12
  final class MediaLoader {
13
13
  private let logger = Logger(subsystem: "com.audiobrowser", category: "MediaLoader")
14
14
 
15
- /// Resolves a playback src into a concrete URL + headers/user-agent.
16
- /// The `Track` is threaded through so the resolver can invoke the
17
- /// consumer-supplied `media.resolve(track)` as the final media layer.
15
+ /// Resolves a src into a URL and headers; gets the `Track` so it can apply the consumer's
16
+ /// `media.resolve(track)`.
18
17
  private let resolveUrl: (String, Track?) async -> MediaResolvedUrl
19
18
 
20
19
  init(resolveUrl: @escaping (String, Track?) async -> MediaResolvedUrl) {
21
20
  self.resolveUrl = resolveUrl
22
21
  }
23
22
 
24
- /// Internal access so AVPlayerEngine can read it.
25
23
  private(set) var asset: AVURLAsset?
26
24
 
27
- /// Milliseconds; applied to AVPlayerItem's preferredForwardBufferDuration.
25
+ /// Milliseconds, applied as the item's `preferredForwardBufferDuration`.
28
26
  var bufferDuration: Double = 0
29
27
 
30
28
  enum Event {
31
29
  case prepared(AVPlayerItem)
32
- /// Loading failed; the retry loop decides whether another attempt could help.
30
+ /// The retry loop decides whether another attempt could help.
33
31
  case failed(Error)
34
32
  /// The asset loaded but cannot play.
35
33
  case unplayable
36
- /// The source is not a URL, so no asset exists.
34
+ /// The resolved src is not a URL, so no asset exists.
37
35
  case invalidSource(String)
38
36
  case commonMetadata([AVMetadataItem])
39
37
  case chapterMetadata([AVTimedMetadataGroup])
@@ -42,14 +40,17 @@ final class MediaLoader {
42
40
 
43
41
  var onEvent: (@MainActor (Event) -> Void)?
44
42
 
45
- /// The in-flight resolve. Readable so tests can await the resolve-then-load
46
- /// chain instead of sleeping past it; only this type starts and cancels it.
43
+ /// Readable so tests can await the resolve-then-load chain; only this type starts and
44
+ /// cancels it.
47
45
  private(set) var mediaResolverTask: Task<Void, Never>?
48
46
  private var metadataLoadTask: Task<Void, Never>?
49
47
  private var playableLoadTask: Task<Void, Never>?
50
48
 
51
49
  // MARK: - Public API
52
50
 
51
+ /// Resolves `src` and loads the result, reporting through `onEvent`. Cancels a resolve in
52
+ /// flight; the previous asset's loads stay current, and can still report, until the new
53
+ /// resolve loads an asset (an invalid source leaves them current).
53
54
  func resolveAndLoad(src: String, track: Track? = nil) {
54
55
  mediaResolverTask?.cancel()
55
56
  // `self` stays weak across the await: a consumer resolver that never settles must not pin
@@ -67,7 +68,7 @@ final class MediaLoader {
67
68
  let pendingAsset = AVURLAsset(url: url, options: options)
68
69
  asset = pendingAsset
69
70
 
70
- // Separate from playable loading to allow playback to start faster
71
+ // Apart from the playable load, so playback need not wait for metadata.
71
72
  metadataLoadTask = Task { [weak self] in
72
73
  guard let self else { return }
73
74
 
@@ -95,6 +96,7 @@ final class MediaLoader {
95
96
  }
96
97
  }
97
98
  } else {
99
+ // Without chapters, each format's metadata is one group spanning the whole asset.
98
100
  let duration = await (try? pendingAsset.load(.duration)) ?? .zero
99
101
  for format in metadataFormats {
100
102
  guard isCurrent(pendingAsset) else { return }
@@ -131,15 +133,10 @@ final class MediaLoader {
131
133
  }
132
134
  }
133
135
 
134
- /// Whether `candidate` is still the load this loader cares about — checked
135
- /// after EVERY await, not just once before a loop.
136
- ///
137
- /// Cancellation alone is not enough: it only sets a flag, and can't abort a
138
- /// load already in flight inside AVFoundation (only `cancelLoading()` does,
139
- /// and the track-change path deliberately doesn't call it — the old asset
140
- /// still backs the playing item at that point). So a load that lands after
141
- /// the track changed would otherwise attribute the old asset's metadata to
142
- /// the newly loaded track.
136
+ /// Whether `candidate` is still the asset this loader loads; check it after every await.
137
+ /// Cancelling the task cannot abort a load inside AVFoundation (only `cancelLoading()` does,
138
+ /// and a track change does not call it while the old asset backs the playing item), so a late
139
+ /// result would otherwise land on the next track.
143
140
  private func isCurrent(_ candidate: AVURLAsset) -> Bool {
144
141
  !Task.isCancelled && candidate == asset
145
142
  }
@@ -156,7 +153,7 @@ final class MediaLoader {
156
153
  func clearAsset() {
157
154
  guard let currentAsset = asset else { return }
158
155
 
159
- // Don't call currentAsset.cancelLoading() on main thread - it blocks for 500ms+
156
+ // `cancelLoading()` blocks for 500 ms or more: keep it off the main thread.
160
157
  DispatchQueue.global(qos: .utility).async {
161
158
  currentAsset.cancelLoading()
162
159
  }
@@ -164,10 +161,9 @@ final class MediaLoader {
164
161
  asset = nil
165
162
  }
166
163
 
167
- /// Builds AVURLAsset options, merging any explicit headers with a resolved
168
- /// User-Agent. An explicit `User-Agent` in `headers` wins (mirrors the artwork
169
- /// path in RequestPipeline). A nil/empty userAgent contributes
170
- /// nothing, so "no UA configured" still falls through to AVPlayer's default.
164
+ /// AVURLAsset options carrying `headers`, plus `userAgent` as `User-Agent` unless `headers`
165
+ /// sets one (as the artwork path in RequestPipeline does). Nil when there is nothing to send,
166
+ /// so AVPlayer keeps its default User-Agent.
171
167
  nonisolated static func buildAssetOptions(
172
168
  headers: [String: String]?,
173
169
  userAgent: String?,
@@ -2,7 +2,6 @@
2
2
  import NitroModules
3
3
  #endif
4
4
 
5
- /// The title, artist and album lines the now-playing surface shows.
6
5
  struct NowPlayingLines: Equatable {
7
6
  let title: String
8
7
  let artist: String?
@@ -25,7 +24,6 @@ struct NowPlayingLines: Equatable {
25
24
  }
26
25
  }
27
26
 
28
- /// The lines last stamped on the now-playing surface, and the track they were stamped for.
29
27
  struct PublishedNowPlayingLines {
30
28
  let trackId: String?
31
29
  let lines: NowPlayingLines
@@ -35,13 +33,12 @@ struct PublishedNowPlayingLines {
35
33
  self.lines = lines
36
34
  }
37
35
 
38
- /// `lines` when they were stamped for `track`, else nil.
36
+ /// `lines` when they were published for `track`, else nil.
39
37
  func lines(for track: Track) -> NowPlayingLines? {
40
38
  trackId == (track.identity ?? track.path) ? lines : nil
41
39
  }
42
40
  }
43
41
 
44
- /// What the now-playing surface renders from: the player's track and state.
45
42
  @MainActor
46
43
  protocol NowPlayingSource: AnyObject {
47
44
  var currentTrack: Track? { get }
@@ -3,10 +3,9 @@ import MediaPlayer
3
3
  import NitroModules
4
4
  import os.log
5
5
 
6
- /// Owns the now-playing surface: publishes a track's static fields + artwork, and renders the
7
- /// title/artist line — a flash, else the formatter's result, else the override or the track's own
8
- /// fields. Holds that state (override, flash, latest timed metadata, formatter) and reports each
9
- /// change of the rendered lines through `onChanged`.
6
+ /// Owns the now-playing info: a track's static fields and artwork, and its title, artist and
7
+ /// album lines, each taken from a flash, else the formatter's result, else the override, else the
8
+ /// track.
10
9
  @MainActor
11
10
  final class NowPlayingUpdater {
12
11
  private let logger = Logger(subsystem: "com.audiobrowser", category: "NowPlayingUpdater")
@@ -14,27 +13,24 @@ final class NowPlayingUpdater {
14
13
 
15
14
  weak var source: NowPlayingSource?
16
15
  var artworkUrlResolver: ((Track, ImageContext?) async -> ImageSource?)?
17
- /// Called with the JS-facing metadata whenever the rendered lines or the track change.
16
+ /// Called whenever the published lines or their track change.
18
17
  var onChanged: ((NowPlayingMetadata) -> Void)?
19
18
 
20
- /// When false the surface shows the track's own fields: the override and formatter are ignored.
19
+ /// When false the override and formatter are ignored.
21
20
  private let enabled: Bool
22
21
  var formatter: ((_ params: FormatNowPlayingParams) -> Promise<NowPlayingUpdate?>)?
23
22
 
24
- /// Tells a stall apart: offline or buffering.
25
23
  private weak var networkStatus: (any NetworkStatusProviding)?
26
24
 
27
25
  private var override: NowPlayingUpdate?
28
26
  private var timedMetadata: TimedMetadata?
29
- /// A transient line (e.g. feedback for a refused remote command) that outranks the formatter
30
- /// and the override, reverted by a native timer: JS timers pause in the background.
27
+ /// Reverted by a native timer, not by JS: JS timers pause in the background.
31
28
  private var flash: NowPlayingUpdate?
32
29
  private var flashRevert: DispatchWorkItem?
33
30
 
34
31
  private var artworkLoadTask: Task<Void, Never>?
35
32
 
36
- /// The lines `onChanged` last reported, and their track, so a new track with the same text
37
- /// still reports.
33
+ /// Kept with its track so a new track with the same text still reports through `onChanged`.
38
34
  private var published: PublishedNowPlayingLines?
39
35
 
40
36
  func setOverride(_ update: NowPlayingUpdate?) {
@@ -66,7 +62,6 @@ final class NowPlayingUpdater {
66
62
  render()
67
63
  }
68
64
 
69
- /// A new track drops the override, flash and timed metadata of the last one.
70
65
  func trackChanged() {
71
66
  override = nil
72
67
  cancelFlash()
@@ -74,8 +69,8 @@ final class NowPlayingUpdater {
74
69
  render()
75
70
  }
76
71
 
77
- /// The lines the surface shows for the current track, formatter result included; until the
78
- /// track's first render, and while `enabled` is false, the flash, override or track fields.
72
+ /// The lines last published for the current track; before its first render, or while `enabled`
73
+ /// is false, the flash, override or track's own lines.
79
74
  var nowPlaying: NowPlayingMetadata? {
80
75
  guard let track = source?.currentTrack else { return nil }
81
76
  let rendered = enabled ? published?.lines(for: track) : nil
@@ -83,7 +78,7 @@ final class NowPlayingUpdater {
83
78
  return metadata(track: track, lines: lines)
84
79
  }
85
80
 
86
- /// Empties the now-playing surface and drops any artwork fetch or formatter result in flight.
81
+ /// Also drops any artwork fetch or formatter result in flight.
87
82
  func clearNowPlaying() {
88
83
  renderGeneration &+= 1
89
84
  artworkLoadTask?.cancel()
@@ -93,15 +88,11 @@ final class NowPlayingUpdater {
93
88
  formattedTrackId = nil
94
89
  }
95
90
 
96
- /// Bumped on every `render`; an async formatter result applies only if its render is still the
97
- /// latest (latest-render-wins — drops a result whose track skipped or whose state moved on while
98
- /// the formatter was in flight).
91
+ /// A formatter result applies only if no later `render` has started.
99
92
  private var renderGeneration: UInt = 0
100
93
 
101
- /// The track whose *formatted* line is currently on the surface. While this
102
- /// matches the rendering track, `render` skips its interim default write — see
103
- /// the comment at that site. Cleared whenever the surface stops showing a
104
- /// formatter result (a flash overwrites it, `clearNowPlaying` empties it).
94
+ /// The track whose formatter result is on screen; while it matches, `render` skips writing the
95
+ /// unformatted lines.
105
96
  private var formattedTrackId: String?
106
97
 
107
98
  init(
@@ -116,10 +107,8 @@ final class NowPlayingUpdater {
116
107
  self.formatter = formatter
117
108
  }
118
109
 
119
- /// Pixel width to request now-playing artwork at: the active scene's screen
120
- /// width in pixels, capped at `maxArtworkPixelWidth`. With no foreground
121
- /// scene (headless CarPlay) the cap stands in — every current device exceeds
122
- /// it anyway, and this only sizes a CDN request.
110
+ /// With no foreground scene (headless CarPlay) the cap stands in: every current device exceeds
111
+ /// it, and it only sizes the request.
123
112
  private static var artworkPixelWidth: CGFloat {
124
113
  guard let screen = UIApplication.shared.activeWindowScene?.screen else {
125
114
  return maxArtworkPixelWidth
@@ -127,24 +116,20 @@ final class NowPlayingUpdater {
127
116
  return min(screen.bounds.width * screen.scale, maxArtworkPixelWidth)
128
117
  }
129
118
 
130
- /// Mirrored by the Kotlin twin's `artworkSizePx`.
119
+ /// Matches the Kotlin side's `artworkSizePx`.
131
120
  private static let maxArtworkPixelWidth: CGFloat = 1200
132
121
 
133
- /// Publishes the static, per-track fields + artwork on a track change. The title/artist/album
134
- /// lines are owned by `render` (routed through `apply` here so it dedupes against later
135
- /// renders).
122
+ /// Publishes the track's static fields, artwork and its own lines, without the override or
123
+ /// formatter (`render` applies those). The lines go through `apply` so later renders dedupe
124
+ /// against them.
136
125
  func loadMetaValues(for track: Track) {
137
126
  nowPlayingInfoController.set([MPNowPlayingInfoPropertyIsLiveStream: track.live])
138
127
  apply(.resolve(track: track), for: track)
139
128
  loadArtwork(for: track)
140
129
  }
141
130
 
142
- /// Renders the now-playing text lines (title, artist, album): the default (`override ?? track`)
143
- /// immediately, then — when a formatter is configured — its async result overlaid (each field
144
- /// falling back to the default). A `flash` (transient line, e.g. feedback for a refused remote
145
- /// command) outranks both: while one is active the formatter pass is skipped entirely, so its
146
- /// async result can't land on top. Called on every playback transition; unchanged lines are not
147
- /// re-published.
131
+ /// Runs on every playback transition; publishes only lines that changed. While a flash is up,
132
+ /// the formatter is not called, so its result cannot land over the flash.
148
133
  func render() {
149
134
  guard let source, let track = source.currentTrack else { return }
150
135
  let override = enabled ? self.override : nil
@@ -156,19 +141,14 @@ final class NowPlayingUpdater {
156
141
 
157
142
  if let flash {
158
143
  apply(.resolve(track: track, flash: flash, override: override), for: track)
159
- // The flash replaced the formatter's line, so the surface no longer shows
160
- // one: the render that follows the flash reverting must publish the default
161
- // immediately rather than sit on stale flash text awaiting the formatter.
144
+ // Once the flash reverts, the next render must publish the unformatted lines at once rather
145
+ // than leave the flash text up until the formatter answers.
162
146
  formattedTrackId = nil
163
147
  return
164
148
  }
165
149
 
166
- // Publish the raw default only while no formatter result is on screen for this
167
- // track. `render` runs on EVERY playback transition (state change, playing/
168
- // buffering flip, timed-metadata tick, connectivity change); writing the
169
- // default each time would flash the track title over the formatter's line
170
- // until the async result lands, since the two differ by construction on a live
171
- // stream (station name vs. song line).
150
+ // Writing the unformatted lines on every render would flash the track title over the
151
+ // formatter's line until its result lands; on a live stream the two always differ.
172
152
  if formatter == nil || formattedTrackId != trackId {
173
153
  apply(.resolve(track: track, override: override), for: track)
174
154
  }
@@ -181,19 +161,15 @@ final class NowPlayingUpdater {
181
161
  stalled: source.isStalled ? ((networkStatus?.isOnline ?? true) ? .buffering : .offline) : nil,
182
162
  error: source.nitroPlaybackError,
183
163
  )
184
- // `@Sendable` breaks the @MainActor isolation inheritance: Nitro resolves the promise on the JS
185
- // thread, so the resolver must NOT be main-isolated (a main-isolated closure run off-main traps
186
- // in `_swift_task_checkIsolated`). Hop back to the main actor to apply (same pattern as the
187
- // artwork callback below).
164
+ // Nitro resolves the promise on the JS thread, and a main-isolated closure run off-main traps
165
+ // in `_swift_task_checkIsolated`; `@Sendable` drops the inherited isolation, then the Task hops
166
+ // back to the main actor.
188
167
  formatter(params)
189
168
  .then { @Sendable [weak self] formatted in
190
169
  guard let self, let formatted else { return }
191
170
  Task { @MainActor in
192
- // Apply only if no newer render has superseded this one (fast skip / state moved on).
193
171
  guard self.renderGeneration == generation else { return }
194
172
  self.apply(.resolve(track: track, formatted: formatted, override: override), for: track)
195
- // A formatter result now owns the surface for this track, so later
196
- // renders skip the interim default write.
197
173
  self.formattedTrackId = trackId
198
174
  }
199
175
  }
@@ -207,8 +183,7 @@ final class NowPlayingUpdater {
207
183
 
208
184
  // MARK: - Private
209
185
 
210
- /// Stamps the lines onto the now-playing surface, and notifies `onChanged` when the text or the
211
- /// track changed.
186
+ /// Calls `onChanged` only when the text or the track changed.
212
187
  private func apply(_ lines: NowPlayingLines, for track: Track) {
213
188
  let textChanged = nowPlayingInfoController.set([
214
189
  MPMediaItemPropertyTitle: lines.title,
@@ -240,8 +215,8 @@ final class NowPlayingUpdater {
240
215
  )
241
216
  }
242
217
 
243
- /// The artwork URI JS can load: the resolved `artworkSource` (a rendered SF Symbol's `file://`
244
- /// included), else the raw artwork unless it is an SF Symbol.
218
+ /// `artworkSource` (a rendered SF Symbol's `file://` included), else the raw artwork unless it
219
+ /// is an SF Symbol, which JS cannot load.
245
220
  private static func jsArtwork(for track: Track) -> String? {
246
221
  if let uri = track.artworkSource?.uri { return uri }
247
222
  guard let artwork = track.artwork?.url else { return nil }
@@ -249,8 +224,8 @@ final class NowPlayingUpdater {
249
224
  }
250
225
 
251
226
  private func loadArtwork(for track: Track) {
252
- // Now-playing is a single image with no appearance to key off, so a pair
253
- // collapses to its dark URL (see `Variant_String_ArtworkVariants.url`).
227
+ // Now-playing has no appearance to key off, so a light/dark pair collapses to its dark URL
228
+ // (see `Variant_String_ArtworkVariants.url`).
254
229
  let artworkUrl = track.artworkSource?.uri ?? track.artwork?.url
255
230
  logger.debug("loadArtwork: \(track.title), artworkUrl: \(artworkUrl ?? "nil")")
256
231
 
@@ -261,7 +236,6 @@ final class NowPlayingUpdater {
261
236
  artworkLoadTask = Task {
262
237
  let image: UIImage?
263
238
 
264
- // Resolver provides size context for CDN optimization
265
239
  if let resolver = artworkUrlResolver,
266
240
  let imageSource = await resolver(track, nowPlayingSize)
267
241
  {
@@ -281,8 +255,8 @@ final class NowPlayingUpdater {
281
255
 
282
256
  if let image {
283
257
  logger.debug("loadArtwork: loaded image \(image.size.width)x\(image.size.height)")
284
- // Note: The requestHandler closure is called from MediaPlayer's background queue,
285
- // so we must mark it @Sendable to break @MainActor isolation inheritance.
258
+ // MediaPlayer calls the handler on a background queue; `@Sendable` drops the inherited
259
+ // @MainActor isolation.
286
260
  let artwork = MPMediaItemArtwork(boundsSize: image.size) { @Sendable requestedSize in
287
261
  return image
288
262
  }
@@ -1,7 +1,6 @@
1
1
  import Foundation
2
2
 
3
- /// A serialisable snapshot of the player's resumable state. Mirrors Android's
4
- /// `PlaybackStateStore.PersistedState`. `positionMs` is `nil` for live streams.
3
+ /// Mirrors Android's `PlaybackStateStore.PersistedState`. `positionMs` is nil for live streams.
5
4
  struct PersistedPlaybackState: Codable {
6
5
  let track: JsonTrack
7
6
  let positionMs: Double?
@@ -1,24 +1,23 @@
1
1
  import AVFoundation
2
2
  import Foundation
3
3
 
4
- /// What a playback failure is reported as, and whether another attempt could fix it: one table,
5
- /// so the error JS receives and the retry decision are read off the same evidence.
4
+ /// Reads the error reported to JS and the retry decision off the same evidence.
6
5
  enum PlaybackFailure {
7
6
  struct Classification: Equatable {
8
- /// The narrowest error the evidence supports, falling back to the context's error.
7
+ /// The narrowest error the evidence supports, else the caller's `fallback`.
9
8
  let error: TrackPlayerError.PlaybackError
10
9
  let retryable: Bool
11
10
  }
12
11
 
13
- /// Classifies a failure. AVFoundation reports HTTP failures as opaque CoreMedia errors, so
14
- /// `httpStatusCode` comes from the item's error log, passed in by the caller.
12
+ /// Classifies a failure. `httpStatusCode` comes from the item's error log: AVFoundation reports
13
+ /// HTTP failures as opaque CoreMedia errors.
15
14
  ///
16
- /// Both read the error and the errors it wraps, but rank the evidence differently, on purpose:
17
- /// - The error: a transport failure first (no response arrived, so a status left in the log
18
- /// describes an earlier attempt), then a non-2xx status, then media that cannot be decoded.
19
- /// - Retrying: a status first (a retry cannot conjure content the server refused), then the
20
- /// error and the errors it wraps. An unrecognized failure is transient, bounded by the retry
21
- /// budgets, as on Android: AVFoundation reports most stream failures opaquely.
15
+ /// The two answers rank the evidence differently, on purpose:
16
+ /// - The error: a transport failure first (no response arrived, so a logged status belongs to
17
+ /// an earlier attempt), then a non-2xx status, then undecodable media.
18
+ /// - Retrying: a status first (a retry cannot change what the server refused), then the error
19
+ /// chain. An unrecognized failure counts as retryable, bounded by the retry budgets, as on
20
+ /// Android: AVFoundation reports most stream failures opaquely.
22
21
  static func classify(
23
22
  _ error: Error?,
24
23
  httpStatusCode: Int?,
@@ -30,9 +29,9 @@ enum PlaybackFailure {
30
29
  )
31
30
  }
32
31
 
33
- /// Picks the HTTP status out of an `AVPlayerItem` error log's status codes. The codes share
34
- /// their space with negative OSStatus values, so only in-range values count, and the newest
35
- /// wins: a live stream reconnects, and older entries describe earlier attempts.
32
+ /// The HTTP status among an `AVPlayerItem` error log's status codes. Negative OSStatus values
33
+ /// share the field, so only 100–599 counts, and the newest wins: a live stream reconnects, and
34
+ /// older entries describe earlier attempts.
36
35
  static func httpStatusCode(fromErrorStatusCodes codes: [Int]) -> Int? {
37
36
  codes.last { (100 ... 599).contains($0) }
38
37
  }
@@ -45,7 +44,7 @@ enum PlaybackFailure {
45
44
  fallback: TrackPlayerError.PlaybackError,
46
45
  ) -> TrackPlayerError.PlaybackError {
47
46
  let chain = error.map(errorChain) ?? []
48
- // `as?` bridges a plain NSError in NSURLErrorDomain too, AVFoundation's usual form.
47
+ // `as` also bridges a plain NSError in NSURLErrorDomain, AVFoundation's usual form.
49
48
  for case let urlError as URLError in chain {
50
49
  switch urlError.code {
51
50
  case .notConnectedToInternet:
@@ -67,8 +66,7 @@ enum PlaybackFailure {
67
66
  return unplayable ? .trackWasUnplayable : fallback
68
67
  }
69
68
 
70
- /// The stream arrived but cannot be decoded: unknown container, unsupported codec, or no
71
- /// decoder.
69
+ /// The stream arrived but cannot be decoded.
72
70
  private static let unplayableAVErrorCodes: Set<Int> = [
73
71
  AVError.fileFormatNotRecognized.rawValue,
74
72
  AVError.failedToParse.rawValue,
@@ -80,13 +78,12 @@ enum PlaybackFailure {
80
78
 
81
79
  // MARK: - Retrying
82
80
 
83
- /// Beyond the 500–599 range. Android shares 408/429 but lists only 500/502/503/504 of 5xx.
81
+ /// Retried besides 500–599. Android shares 408/429 but retries only 500/502/503/504 of 5xx.
84
82
  private static let retryableHTTPStatusCodes: Set<Int> = [408, 429]
85
83
 
86
- /// AVFoundation failures a retry cannot fix: the media is unusable, not the transport
87
- /// unreliable. Every unplayable code but the temporary decoder shortage is here, so a failure
88
- /// reported as unplayable is never also retried. `AVError.unknown` is absent on purpose: it
89
- /// is the wrapper around opaque CoreMedia transport failures.
84
+ /// Failures a retry cannot fix. Every unplayable code but the temporary decoder shortage is
85
+ /// here, so a failure reported as unplayable is never also retried. `AVError.unknown` stays out:
86
+ /// it wraps opaque CoreMedia transport failures.
90
87
  private static let fatalAVErrorCodes: Set<Int> = unplayableAVErrorCodes
91
88
  .subtracting([AVError.decoderTemporarilyUnavailable.rawValue])
92
89
  .union([
@@ -111,8 +108,7 @@ enum PlaybackFailure {
111
108
  return true
112
109
  }
113
110
 
114
- /// The error and its `NSUnderlyingError` ancestors, outermost first, bounded so a malformed
115
- /// cycle cannot spin.
111
+ /// The error and its `NSUnderlyingError` ancestors, outermost first; capped so a cycle cannot spin.
116
112
  private static func errorChain(_ error: Error) -> [Error] {
117
113
  var chain: [Error] = []
118
114
  var current: Error? = error
@@ -1,8 +1,7 @@
1
1
  import Foundation
2
2
 
3
- /// Keeps the player's resumable state in UserDefaults so a cold-start resume can restore the
4
- /// last session without the JS runtime. Saves on demand and, while the play intent is active,
5
- /// every `saveInterval`. Swift counterpart of Android's `PlaybackStateStore.kt`.
3
+ /// Keeps the resumable state in UserDefaults so a cold-start resume can restore the last session
4
+ /// without the JS runtime. Swift counterpart of Android's `PlaybackStateStore.kt`.
6
5
  @MainActor
7
6
  final class PlaybackPersistence {
8
7
  static let standardDefaults = UserDefaults(suiteName: "com.audiobrowser.playback") ?? .standard
@@ -34,7 +33,7 @@ final class PlaybackPersistence {
34
33
  return try? JSONDecoder().decode(PersistedPlaybackState.self, from: data)
35
34
  }
36
35
 
37
- /// Saves periodically while `active`, and once when it turns false.
36
+ /// Saves every `saveInterval` while `active`, and once when it turns false.
38
37
  func playIntentDidChange(active: Bool) {
39
38
  periodicSave?.cancel()
40
39
  periodicSave = nil
@@ -51,8 +50,8 @@ final class PlaybackPersistence {
51
50
  }
52
51
  }
53
52
 
54
- /// The state a resume restores. A live stream keeps no position, and an ended track resumes
55
- /// from 0: at .ended the position is the duration, which would re-end at once (Android twin:
53
+ /// The state a resume restores. A live stream keeps no position, and an ended track saves 0:
54
+ /// at .ended the position is the duration, which would end again at once (Android:
56
55
  /// savePositionZero).
57
56
  static func snapshot(
58
57
  of track: Track,
@@ -1,8 +1,7 @@
1
- /// Determines the next playback state for a given event, or `nil` to suppress the transition.
1
+ /// The state an event leads to, or nil to leave the state as it is.
2
2
  ///
3
- /// Guards here are **state-related** (e.g., "only from .loading"). Context-related
4
- /// guards (e.g., `asset != nil`, `nearTrackEnd`, `!playWhenReady`) live at the call
5
- /// site and decide whether to fire the event at all.
3
+ /// Guards here depend only on the current state. Guards on context (`asset != nil`,
4
+ /// `nearTrackEnd`, `!playWhenReady`) live at the call site, which decides whether to send the event.
6
5
  func nextPlaybackState(from current: PlaybackState, on event: PlaybackEvent) -> PlaybackState? {
7
6
  switch event {
8
7
  case .stopped: return .stopped
@@ -19,16 +18,14 @@ func nextPlaybackState(from current: PlaybackState, on event: PlaybackEvent) ->
19
18
  case let .avPlayerPaused(hasAsset):
20
19
  guard current != .stopped else { return nil }
21
20
  if !hasAsset { return PlaybackState.none }
22
- // .error and .ended own their state against stray pause observations —
23
- // reachable from .ended since the natural-end intent clear opens the
24
- // call site's `!playWhenReady` gate.
21
+ // .error and .ended hold against stray pause observations; .ended sees them because the
22
+ // natural-end intent clear opens the call site's `!playWhenReady` gate.
25
23
  guard current != .error, current != .ended else { return nil }
26
24
  return .paused
27
25
  case .bufferingSufficient:
28
- // Terminal states must not drift back to .ready on a buffer refill: .ended
29
- // would restart the completed track (playWhenReady is still true), and
30
- // .stopped/.error would skip the reload-on-play path, which only triggers
31
- // from those states. Leaving them requires an explicit load or reload.
26
+ // A buffer refill must not move a terminal state back to .ready: .ended would restart the
27
+ // finished track (playWhenReady is still true), and .stopped/.error would skip reload-on-play,
28
+ // which starts only from those states. Leaving them takes an explicit load or reload.
32
29
  guard current != .playing, current != .ended, current != .stopped, current != .error
33
30
  else { return nil }
34
31
  return .ready