react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -19
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/lib/commonjs/CLAUDE.md +7 -2
- package/lib/commonjs/features/battery.js +16 -12
- package/lib/commonjs/features/battery.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +1 -1
- package/lib/commonjs/features/browser.js +74 -24
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +3 -4
- package/lib/commonjs/features/carConnection.js.map +1 -1
- package/lib/commonjs/features/equalizer.js +9 -5
- package/lib/commonjs/features/equalizer.js.map +1 -1
- package/lib/commonjs/features/errors.js +35 -21
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/favorites.js +15 -13
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +12 -6
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +16 -14
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +5 -1
- package/lib/commonjs/features/network.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +28 -14
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/output.js +8 -4
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +10 -5
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +6 -5
- package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
- package/lib/commonjs/features/playback/playing.js +5 -3
- package/lib/commonjs/features/playback/playing.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +11 -5
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +6 -5
- package/lib/commonjs/features/playback/volume.js.map +1 -1
- package/lib/commonjs/features/player/options.js +20 -10
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +34 -38
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +0 -1
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +48 -20
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +2 -1
- package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
- package/lib/commonjs/features/queue/shuffle.js +0 -1
- package/lib/commonjs/features/queue/shuffle.js.map +1 -1
- package/lib/commonjs/features/remoteControls.js +59 -35
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +15 -6
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +6 -9
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +13 -12
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +6 -4
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -1
- package/lib/commonjs/utils/useDebug.js +16 -3
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +2 -4
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
- package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +1 -3
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/CLAUDE.md +7 -2
- package/lib/module/features/battery.js +16 -12
- package/lib/module/features/battery.js.map +1 -1
- package/lib/module/features/browser-config.js +1 -1
- package/lib/module/features/browser.js +74 -24
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +3 -4
- package/lib/module/features/carConnection.js.map +1 -1
- package/lib/module/features/equalizer.js +9 -5
- package/lib/module/features/equalizer.js.map +1 -1
- package/lib/module/features/errors.js +35 -21
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/favorites.js +15 -13
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +12 -6
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +16 -14
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +5 -1
- package/lib/module/features/network.js.map +1 -1
- package/lib/module/features/nowPlaying.js +28 -14
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/output.js +8 -4
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +10 -5
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +6 -5
- package/lib/module/features/playback/playWhenReady.js.map +1 -1
- package/lib/module/features/playback/playing.js +5 -3
- package/lib/module/features/playback/playing.js.map +1 -1
- package/lib/module/features/playback/progress.js +11 -5
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +6 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +6 -5
- package/lib/module/features/playback/volume.js.map +1 -1
- package/lib/module/features/player/options.js +20 -10
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +34 -38
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +0 -1
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +48 -20
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +2 -1
- package/lib/module/features/queue/repeatMode.js.map +1 -1
- package/lib/module/features/queue/shuffle.js +0 -1
- package/lib/module/features/queue/shuffle.js.map +1 -1
- package/lib/module/features/remoteControls.js +59 -35
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +15 -6
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +6 -9
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +13 -12
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +6 -4
- package/lib/module/utils/getTrackIdentity.js.map +1 -1
- package/lib/module/utils/useDebug.js +16 -3
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +2 -4
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/parseSearchResponse.js +3 -4
- package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/module/web/browser/sections.js +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +1 -3
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/features/battery.d.ts +17 -12
- package/lib/typescript/src/features/battery.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +64 -24
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +3 -4
- package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +9 -5
- package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +37 -22
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/favorites.d.ts +15 -13
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +14 -8
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +37 -17
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +5 -1
- package/lib/typescript/src/features/network.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +10 -5
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
- package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +16 -3
- package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +11 -5
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +8 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +6 -5
- package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +52 -37
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +65 -60
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +0 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +48 -20
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +58 -25
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +54 -57
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +181 -144
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +6 -9
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +13 -12
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +6 -4
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts +16 -3
- package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/CLAUDE.md +7 -2
- package/src/docs-floors.test.ts +71 -0
- package/src/features/battery.ts +17 -13
- package/src/features/browser-config.ts +1 -1
- package/src/features/browser.ts +65 -24
- package/src/features/carConnection.ts +3 -4
- package/src/features/equalizer.ts +9 -5
- package/src/features/errors.ts +37 -22
- package/src/features/favorites.ts +15 -13
- package/src/features/gate.ts +14 -8
- package/src/features/metadata.ts +37 -17
- package/src/features/network.ts +5 -1
- package/src/features/nowPlaying.ts +28 -14
- package/src/features/output.ts +8 -4
- package/src/features/playback/controls.ts +10 -5
- package/src/features/playback/playWhenReady.ts +6 -5
- package/src/features/playback/playing.ts +16 -3
- package/src/features/playback/progress.ts +11 -5
- package/src/features/playback/state.ts +8 -3
- package/src/features/playback/trackPlaybackTime.ts +9 -2
- package/src/features/playback/volume.ts +6 -5
- package/src/features/player/options.ts +54 -43
- package/src/features/player/setup.ts +67 -61
- package/src/features/queue/activeTrack.ts +0 -1
- package/src/features/queue/queue.ts +48 -20
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +0 -1
- package/src/features/remoteControls.ts +59 -35
- package/src/features/sleepTimer.ts +15 -7
- package/src/types/browser-nodes.ts +54 -57
- package/src/types/browser.ts +183 -146
- package/src/utils/LazyNativeEmitter.ts +6 -9
- package/src/utils/NativeUpdatedValue.ts +13 -12
- package/src/utils/getTrackIdentity.ts +6 -4
- package/src/utils/useDebug.ts +16 -3
- package/src/web/NativeAudioBrowser.ts +2 -4
- package/src/web/browser/parseSearchResponse.ts +3 -4
- package/src/web/browser/sections.ts +1 -1
- package/src/web/util/BrowserPathHelper.ts +1 -3
- package/website/guide/android-auto.md +25 -13
- package/website/guide/android-certificates.md +199 -120
- package/website/guide/artwork.md +93 -48
- package/website/guide/audio-output.md +86 -68
- package/website/guide/automotive.md +15 -10
- package/website/guide/basic-usage.md +5 -2
- package/website/guide/battery.md +50 -23
- package/website/guide/browser.md +155 -68
- package/website/guide/carplay.md +132 -49
- package/website/guide/configuration.md +85 -49
- package/website/guide/equalizer.md +36 -32
- package/website/guide/errors.md +106 -64
- package/website/guide/favorites.md +41 -31
- package/website/guide/gate.md +24 -10
- package/website/guide/getting-started.md +55 -2
- package/website/guide/hooks.md +53 -47
- package/website/guide/live-streams.md +80 -49
- package/website/guide/metadata.md +87 -53
- package/website/guide/migrating-from-track-player.md +94 -49
- package/website/guide/native-callback-fetch.md +46 -36
- package/website/guide/network.md +36 -20
- package/website/guide/now-playing.md +72 -44
- package/website/guide/playback.md +112 -35
- package/website/guide/queue.md +77 -43
- package/website/guide/remote-controls.md +87 -29
- package/website/guide/search.md +37 -22
- package/website/guide/sleep-timer.md +35 -14
- package/website/guide/track.md +59 -35
|
@@ -6,20 +6,16 @@ import com.facebook.react.turbomodule.core.interfaces.TurboModule
|
|
|
6
6
|
import timber.log.Timber
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
9
|
+
* Disposes the live [AudioBrowser] when the React instance goes away, e.g. on reload.
|
|
10
10
|
*
|
|
11
|
-
* Nitro
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* (and keeps receiving player callbacks over a dead JSI runtime) forever.
|
|
11
|
+
* Nitro runs `dispose()` only when JS calls it, not when the runtime is destroyed; without this the
|
|
12
|
+
* old instance stays registered with the service, the process lifecycle and the car-connection
|
|
13
|
+
* observer, and keeps receiving player callbacks over a dead JSI runtime.
|
|
15
14
|
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
* `needsEagerInit` and `isTurboModule`
|
|
21
|
-
* (`ReactPackageTurboModuleManagerDelegate.getEagerInitModuleNames`). Hence the marker interface —
|
|
22
|
-
* a plain legacy module is created solely on request from JS, which for this one never comes.
|
|
15
|
+
* It exposes nothing to JS, so JS never asks for it: React only invalidates modules it has created,
|
|
16
|
+
* and under bridgeless creates one unasked only if it is both `needsEagerInit` and a [TurboModule]
|
|
17
|
+
* (`ReactPackageTurboModuleManagerDelegate.getEagerInitModuleNames`). Dropping either leaves
|
|
18
|
+
* [invalidate] uncalled.
|
|
23
19
|
*/
|
|
24
20
|
internal class AudioBrowserLifecycleModule(reactContext: ReactApplicationContext) :
|
|
25
21
|
BaseJavaModule(reactContext), TurboModule {
|
|
@@ -19,9 +19,7 @@ public class AudioBrowserPackage : TurboReactPackage() {
|
|
|
19
19
|
AudioBrowserLifecycleModule.NAME,
|
|
20
20
|
AudioBrowserLifecycleModule::class.java.name,
|
|
21
21
|
false, // canOverrideExistingModule
|
|
22
|
-
//
|
|
23
|
-
// teardown callback, which never arrives if the module is never created. Both flags are
|
|
24
|
-
// required for that — see the note on the module.
|
|
22
|
+
// Must stay eager: see AudioBrowserLifecycleModule for why it is never created otherwise.
|
|
25
23
|
true, // needsEagerInit
|
|
26
24
|
false, // isCxxModule
|
|
27
25
|
ReactModuleInfo.classIsTurboModule(AudioBrowserLifecycleModule::class.java),
|
|
@@ -21,9 +21,7 @@ import com.margelo.nitro.audiobrowser.TimedMetadata
|
|
|
21
21
|
import com.margelo.nitro.audiobrowser.Track
|
|
22
22
|
import com.margelo.nitro.audiobrowser.TrackMetadata
|
|
23
23
|
|
|
24
|
-
/** Callbacks for all player events. */
|
|
25
24
|
interface Callbacks {
|
|
26
|
-
// Playback state events
|
|
27
25
|
fun onPlaybackChanged(playback: Playback)
|
|
28
26
|
|
|
29
27
|
fun onPlaybackActiveTrackChanged(event: PlaybackActiveTrackChangedEvent)
|
|
@@ -46,14 +44,13 @@ interface Callbacks {
|
|
|
46
44
|
|
|
47
45
|
fun onPlaybackError(error: PlaybackError?)
|
|
48
46
|
|
|
49
|
-
// Metadata events
|
|
50
47
|
fun onTrackMetadata(metadata: TrackMetadata)
|
|
51
48
|
|
|
52
49
|
fun onChapterMetadata(chapters: List<ChapterMetadata>)
|
|
53
50
|
|
|
54
51
|
fun onTimedMetadata(metadata: TimedMetadata)
|
|
55
52
|
|
|
56
|
-
//
|
|
53
|
+
// handleRemote*: true when JS handled the command, so the player skips its default action.
|
|
57
54
|
fun handleRemotePlay(): Boolean
|
|
58
55
|
|
|
59
56
|
fun handleRemotePause(): Boolean
|
|
@@ -70,21 +67,15 @@ interface Callbacks {
|
|
|
70
67
|
|
|
71
68
|
fun handleRemoteSeek(event: RemoteSeekEvent): Boolean
|
|
72
69
|
|
|
73
|
-
// Configuration events
|
|
74
70
|
fun onOptionsChanged(options: PlayerUpdateOptions)
|
|
75
71
|
|
|
76
|
-
// Favorite events
|
|
77
72
|
fun onFavoriteChanged(event: FavoriteChangedEvent)
|
|
78
73
|
|
|
79
|
-
// Now playing metadata events
|
|
80
74
|
fun onNowPlayingChanged(metadata: NowPlayingMetadata)
|
|
81
75
|
|
|
82
|
-
// Network connectivity events
|
|
83
76
|
fun onOnlineChanged(online: Boolean)
|
|
84
77
|
|
|
85
|
-
// Equalizer events
|
|
86
78
|
fun onEqualizerChanged(settings: EqualizerSettings)
|
|
87
79
|
|
|
88
|
-
// Sleep timer events
|
|
89
80
|
fun onSleepTimerChanged(timer: SleepTimer?)
|
|
90
81
|
}
|
|
@@ -22,10 +22,10 @@ import kotlinx.coroutines.launch
|
|
|
22
22
|
import timber.log.Timber
|
|
23
23
|
|
|
24
24
|
/**
|
|
25
|
-
* Runs [play] for a start sent with `startForegroundService`,
|
|
26
|
-
* meanwhile ([holdForeground]).
|
|
27
|
-
*
|
|
28
|
-
*
|
|
25
|
+
* Runs [play] for a start sent with `startForegroundService`, with the service held in the
|
|
26
|
+
* foreground meanwhile ([holdForeground]). [play] reports failure by returning false, not by
|
|
27
|
+
* throwing; then the placeholder is released, and the service stops unless [hasMedia] says the
|
|
28
|
+
* player still has something to keep it for.
|
|
29
29
|
*/
|
|
30
30
|
internal fun <S> S.playInForeground(
|
|
31
31
|
scope: CoroutineScope,
|
|
@@ -42,14 +42,13 @@ internal fun <S> S.playInForeground(
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
/**
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
* which is reported to [MediaSessionService.Listener.onForegroundServiceStartNotAllowedException].
|
|
45
|
+
* Calls `startForeground()` at once, which Android requires within seconds of a
|
|
46
|
+
* `startForegroundService` start or it kills the app. Uses Media3's notification id and channel
|
|
47
|
+
* (valid while the library sets no notification provider of its own): the media notification if it
|
|
48
|
+
* already shows, else a placeholder, which Media3's next update replaces or removes. Holds nothing
|
|
49
|
+
* below API 26 or when already foreground; below API 29, where that can't be read, it holds
|
|
50
|
+
* Media3's notification again. A start Android refuses goes to
|
|
51
|
+
* [MediaSessionService.Listener.onForegroundServiceStartNotAllowedException].
|
|
53
52
|
*/
|
|
54
53
|
internal fun <S> S.holdForeground()
|
|
55
54
|
where S : MediaSessionService, S : MediaSessionService.Listener {
|
|
@@ -66,8 +65,7 @@ internal fun <S> S.holdForeground()
|
|
|
66
65
|
/**
|
|
67
66
|
* Removes the placeholder [holdForeground] posted, if it is still up, and has Media3 post the
|
|
68
67
|
* notification the player warrants. For a start whose play request changed nothing in the player:
|
|
69
|
-
* Media3 tracks the session only once a controller has connected, so its update
|
|
70
|
-
* come.
|
|
68
|
+
* Media3 tracks the session only once a controller has connected, so its own update may never come.
|
|
71
69
|
*/
|
|
72
70
|
@OptIn(UnstableApi::class)
|
|
73
71
|
internal fun MediaSessionService.releasePlaceholder() {
|
|
@@ -77,10 +75,7 @@ internal fun MediaSessionService.releasePlaceholder() {
|
|
|
77
75
|
triggerNotificationUpdate()
|
|
78
76
|
}
|
|
79
77
|
|
|
80
|
-
/**
|
|
81
|
-
* Whether [this] is a press `MediaButtonReceiver.onReceive` starts the service in the foreground
|
|
82
|
-
* for.
|
|
83
|
-
*/
|
|
78
|
+
/** Whether this is a press `MediaButtonReceiver` starts the service in the foreground for. */
|
|
84
79
|
internal fun Intent.isForegroundStartKey(): Boolean =
|
|
85
80
|
action == Intent.ACTION_MEDIA_BUTTON &&
|
|
86
81
|
IntentCompat.getParcelableExtra(this, Intent.EXTRA_KEY_EVENT, KeyEvent::class.java)?.keyCode in
|
|
@@ -8,12 +8,9 @@ import com.facebook.react.bridge.Arguments
|
|
|
8
8
|
import com.facebook.react.jstasks.HeadlessJsTaskConfig
|
|
9
9
|
import timber.log.Timber
|
|
10
10
|
|
|
11
|
+
/** Runs the JS headless task while [Service] holds its binding; binding starts the task. */
|
|
11
12
|
class HeadlessTaskService : HeadlessJsTaskService() {
|
|
12
13
|
|
|
13
|
-
/**
|
|
14
|
-
* Local binder for service binding. This allows the main AudioBrowserService to bind to this
|
|
15
|
-
* headless service and control its lifecycle.
|
|
16
|
-
*/
|
|
17
14
|
inner class LocalBinder : Binder() {
|
|
18
15
|
fun getService() = this@HeadlessTaskService
|
|
19
16
|
}
|
|
@@ -26,13 +23,12 @@ class HeadlessTaskService : HeadlessJsTaskService() {
|
|
|
26
23
|
"AudioBrowser",
|
|
27
24
|
Arguments.createMap(),
|
|
28
25
|
0, // No timeout
|
|
29
|
-
true, //
|
|
26
|
+
true, // Allowed while the app is in the foreground
|
|
30
27
|
)
|
|
31
28
|
}
|
|
32
29
|
|
|
33
30
|
override fun onBind(intent: Intent): IBinder {
|
|
34
31
|
Timber.d("starting headless task")
|
|
35
|
-
// Start the headless task when bound
|
|
36
32
|
startTask(getTaskConfig(intent))
|
|
37
33
|
return binder
|
|
38
34
|
}
|
|
@@ -49,7 +45,7 @@ class HeadlessTaskService : HeadlessJsTaskService() {
|
|
|
49
45
|
|
|
50
46
|
override fun onHeadlessJsTaskFinish(taskId: Int) {
|
|
51
47
|
Timber.d("task finished: $taskId")
|
|
52
|
-
//
|
|
48
|
+
// Skips super, which stops the service once no task runs; it lives while Service binds it.
|
|
53
49
|
}
|
|
54
50
|
|
|
55
51
|
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
|
@@ -16,13 +16,11 @@ import timber.log.Timber
|
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
* Remote outputs: the speakers and TVs of media route providers, offered in the system Output
|
|
19
|
-
* Switcher next to the phone and Bluetooth,
|
|
20
|
-
*
|
|
21
|
-
*
|
|
19
|
+
* Switcher next to the phone and Bluetooth, the one selected there reported as the [Output]. Only
|
|
20
|
+
* the selection is reported; rendering the audio there is the provider's job, or the Cast session's
|
|
21
|
+
* for a Cast device.
|
|
22
22
|
*
|
|
23
|
-
* Holds the process's one [MediaRouter] while enabled, on Android 11+ where the switcher exists.
|
|
24
|
-
* provider's routes are offered when they declare [CATEGORY] or one of the categories the outputs
|
|
25
|
-
* are turned on with in a control filter.
|
|
23
|
+
* Holds the process's one [MediaRouter] while enabled, on Android 11+ where the switcher exists.
|
|
26
24
|
*/
|
|
27
25
|
object RemoteOutputs {
|
|
28
26
|
/** The control category a media route provider's routes declare to be offered as outputs. */
|
|
@@ -32,8 +30,8 @@ object RemoteOutputs {
|
|
|
32
30
|
|
|
33
31
|
private var selector = selectorFor(types)
|
|
34
32
|
|
|
35
|
-
//
|
|
36
|
-
//
|
|
33
|
+
// MediaRouter holds routers weakly: let this one go and the Output Switcher stops listing the
|
|
34
|
+
// category's routes, as the app's discovery preference empties on the next GC.
|
|
37
35
|
private var router: MediaRouter? = null
|
|
38
36
|
|
|
39
37
|
private val listeners = CopyOnWriteArraySet<() -> Unit>()
|
|
@@ -149,8 +147,8 @@ object RemoteOutputs {
|
|
|
149
147
|
}
|
|
150
148
|
|
|
151
149
|
/**
|
|
152
|
-
* The [Output] a selected route stands for,
|
|
153
|
-
* [
|
|
150
|
+
* The [Output] a selected route stands for, typed by the first category in [types] it [supports],
|
|
151
|
+
* else [OutputType.REMOTE] for [RemoteOutputs.CATEGORY]; null for a route the outputs don't offer.
|
|
154
152
|
*/
|
|
155
153
|
internal fun remoteOutputOf(
|
|
156
154
|
name: String,
|
|
@@ -40,12 +40,11 @@ import kotlinx.coroutines.cancel
|
|
|
40
40
|
import timber.log.Timber
|
|
41
41
|
|
|
42
42
|
/**
|
|
43
|
-
* MediaLibraryService
|
|
43
|
+
* The MediaLibraryService behind background playback, Android Auto and other external controllers.
|
|
44
44
|
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
* record the failure and notify the user on their next session.
|
|
45
|
+
* As a [MediaSessionService.Listener] it records when Android 12+ refuses a foreground service
|
|
46
|
+
* start from the background (a Bluetooth resume while the app is killed, under battery
|
|
47
|
+
* restrictions), so the user can be warned on their next session.
|
|
49
48
|
*/
|
|
50
49
|
@MainThread
|
|
51
50
|
class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
@@ -55,7 +54,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
55
54
|
private lateinit var mediaSession: MediaLibrarySession
|
|
56
55
|
private lateinit var imageLoader: ImageLoader
|
|
57
56
|
|
|
58
|
-
// Callback for battery warning events to notify JS layer
|
|
59
57
|
var onBatteryWarningPendingChanged: ((Boolean) -> Unit)? = null
|
|
60
58
|
|
|
61
59
|
private var artworkProviderDeps: ArtworkProviderDeps? = null
|
|
@@ -66,7 +64,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
66
64
|
*/
|
|
67
65
|
private var moduleBound = false
|
|
68
66
|
|
|
69
|
-
// Headless service binding
|
|
70
67
|
private var headlessBound = false
|
|
71
68
|
private val headlessConnection: ServiceConnection =
|
|
72
69
|
object : ServiceConnection {
|
|
@@ -105,15 +102,13 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
105
102
|
player = Player(this)
|
|
106
103
|
player.setup(PlayerSetupOptions())
|
|
107
104
|
|
|
108
|
-
//
|
|
109
|
-
// Disk cache uses Coil defaults: 2% of disk space, max ~250MB
|
|
105
|
+
// The disk cache keeps Coil's default size limit: 2% of the disk, at most 250 MB.
|
|
110
106
|
imageLoader =
|
|
111
107
|
ImageLoader.Builder(this)
|
|
112
108
|
.components { add(SvgDecoder.Factory()) }
|
|
113
109
|
.diskCache { DiskCache.Builder().directory(cacheDir.resolve("artwork")).build() }
|
|
114
110
|
.build()
|
|
115
111
|
|
|
116
|
-
// Create CoilBitmapLoader for artwork loading with custom headers/auth support
|
|
117
112
|
val coilBitmapLoader =
|
|
118
113
|
CoilBitmapLoader(
|
|
119
114
|
context = this,
|
|
@@ -122,13 +117,12 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
122
117
|
getArtworkSizeHint = { player.artworkSizeHintPixels },
|
|
123
118
|
)
|
|
124
119
|
|
|
125
|
-
// Store references in Player for artwork URL transformation and SVG pre-rendering
|
|
126
120
|
player.coilBitmapLoader = coilBitmapLoader
|
|
127
121
|
player.imageLoader = imageLoader
|
|
128
122
|
player.onPlaybackResumptionFailed = { releasePlaceholder() }
|
|
129
123
|
|
|
130
|
-
//
|
|
131
|
-
//
|
|
124
|
+
// ArtworkContentProvider reads the holder to serve browse artwork to Android Auto and AAOS over
|
|
125
|
+
// content:// URIs.
|
|
132
126
|
val artworkScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
|
133
127
|
artworkProviderDeps =
|
|
134
128
|
ArtworkProviderDeps(
|
|
@@ -138,8 +132,8 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
138
132
|
artworkSizeHint = { player.artworkSizeHintPixels },
|
|
139
133
|
)
|
|
140
134
|
CoilArtworkLoaderHolder.set(artworkProviderDeps!!)
|
|
141
|
-
// Best-effort:
|
|
142
|
-
//
|
|
135
|
+
// Best-effort: the previous process's files are stale, and keeping them grows the disk across
|
|
136
|
+
// restarts. The provider fetches again on demand.
|
|
143
137
|
runCatching {
|
|
144
138
|
java.io
|
|
145
139
|
.File(cacheDir, com.audiobrowser.util.ArtworkContentProvider.ARTWORK_SUBDIR)
|
|
@@ -149,13 +143,12 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
149
143
|
val openAppIntent =
|
|
150
144
|
packageManager.getLaunchIntentForPackage(packageName)?.apply {
|
|
151
145
|
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
|
152
|
-
//
|
|
146
|
+
// Lets the app tell that a notification click opened it.
|
|
153
147
|
data = "audiobrowser://notification".toUri()
|
|
154
148
|
action = Intent.ACTION_VIEW
|
|
155
149
|
}
|
|
156
150
|
mediaSession =
|
|
157
151
|
MediaLibrarySession.Builder(this, player.forwardingPlayer, player.getMediaSessionCallback())
|
|
158
|
-
// Use Coil for artwork loading (enables custom headers, SVG support)
|
|
159
152
|
.setBitmapLoader(CacheBitmapLoader(coilBitmapLoader))
|
|
160
153
|
// https://github.com/androidx/media/issues/1218
|
|
161
154
|
.setSessionActivity(
|
|
@@ -168,11 +161,9 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
168
161
|
)
|
|
169
162
|
.build()
|
|
170
163
|
|
|
171
|
-
// Register this service as a listener to catch foreground service start exceptions
|
|
172
164
|
setListener(this)
|
|
173
165
|
player.setMediaSession(mediaSession)
|
|
174
166
|
|
|
175
|
-
// Bind headless service once at startup for JS task execution
|
|
176
167
|
Intent(applicationContext, HeadlessTaskService::class.java).also { headlessIntent ->
|
|
177
168
|
Timber.d("Binding to HeadlessTaskService for JS execution")
|
|
178
169
|
headlessBound = bindService(headlessIntent, headlessConnection, BIND_AUTO_CREATE)
|
|
@@ -183,7 +174,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
183
174
|
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
|
184
175
|
Timber.d("onStartCommand: action=${intent?.action}")
|
|
185
176
|
|
|
186
|
-
// Handle MEDIA_PLAY_FROM_SEARCH intent for voice commands
|
|
187
177
|
intent
|
|
188
178
|
?.takeIf { it.action == "android.media.action.MEDIA_PLAY_FROM_SEARCH" }
|
|
189
179
|
?.let { searchIntent ->
|
|
@@ -201,41 +191,24 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
201
191
|
return super.onStartCommand(intent, flags, startId)
|
|
202
192
|
}
|
|
203
193
|
|
|
204
|
-
/**
|
|
205
|
-
* Parses MEDIA_PLAY_FROM_SEARCH intent into structured SearchParams.
|
|
206
|
-
*
|
|
207
|
-
* Extracts search mode from EXTRA_MEDIA_FOCUS and relevant metadata fields:
|
|
208
|
-
* - "vnd.android.cursor.item/\*" with empty query → ANY ("play music")
|
|
209
|
-
* - "vnd.android.cursor.item/\*" with query → null (unstructured search)
|
|
210
|
-
* - Audio.Genres.ENTRY_CONTENT_TYPE → GENRE
|
|
211
|
-
* - Audio.Artists.ENTRY_CONTENT_TYPE → ARTIST
|
|
212
|
-
* - Audio.Albums.ENTRY_CONTENT_TYPE → ALBUM
|
|
213
|
-
* - "vnd.android.cursor.item/audio" → SONG
|
|
214
|
-
* - Audio.Playlists.ENTRY_CONTENT_TYPE → PLAYLIST
|
|
215
|
-
* - null or unknown → null (unstructured search)
|
|
216
|
-
*
|
|
217
|
-
* See: https://developer.android.com/guide/components/intents-common#PlaySearch
|
|
218
|
-
*/
|
|
194
|
+
/** See https://developer.android.com/guide/components/intents-common#PlaySearch */
|
|
219
195
|
private fun parseSearchIntent(intent: Intent): SearchParams {
|
|
220
|
-
// Get the search query from SearchManager.QUERY
|
|
221
196
|
val query = intent.getStringExtra(SearchManager.QUERY) ?: ""
|
|
222
197
|
|
|
223
|
-
// Get the media focus type (what kind of media to search for)
|
|
224
198
|
val mediaFocus = intent.getStringExtra(MediaStore.EXTRA_MEDIA_FOCUS)
|
|
225
199
|
|
|
226
|
-
//
|
|
227
|
-
//
|
|
228
|
-
//
|
|
229
|
-
//
|
|
200
|
+
// The focus picks a vertical. Genre, artist and album focuses are filters, carried by the
|
|
201
|
+
// extras
|
|
202
|
+
// below, so they yield no mode. Android has no station or podcast focus: those verticals are
|
|
203
|
+
// iOS-only.
|
|
230
204
|
val mode =
|
|
231
205
|
when (mediaFocus) {
|
|
232
206
|
"vnd.android.cursor.item/*" -> if (query.isEmpty()) SearchMode.ANY else null
|
|
233
207
|
"vnd.android.cursor.item/audio" -> SearchMode.SONG
|
|
234
208
|
MediaStore.Audio.Playlists.ENTRY_CONTENT_TYPE -> SearchMode.PLAYLIST
|
|
235
|
-
else -> null
|
|
209
|
+
else -> null
|
|
236
210
|
}
|
|
237
211
|
|
|
238
|
-
// Extract structured metadata fields
|
|
239
212
|
val genre = intent.getStringExtra("android.intent.extra.genre")
|
|
240
213
|
val artist = intent.getStringExtra(MediaStore.EXTRA_MEDIA_ARTIST)
|
|
241
214
|
val album = intent.getStringExtra(MediaStore.EXTRA_MEDIA_ALBUM)
|
|
@@ -276,11 +249,10 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
276
249
|
|
|
277
250
|
Timber.d("player = $player, appKilledPlaybackBehavior = $appKilledPlaybackBehavior")
|
|
278
251
|
|
|
279
|
-
//
|
|
252
|
+
// The system UI's controller backs the notification, so it doesn't count as external.
|
|
280
253
|
val hasExternalControllers =
|
|
281
254
|
mediaSession.connectedControllers.any { controller ->
|
|
282
|
-
controller.packageName != packageName &&
|
|
283
|
-
controller.packageName != "com.android.systemui" // Not system UI
|
|
255
|
+
controller.packageName != packageName && controller.packageName != "com.android.systemui"
|
|
284
256
|
}
|
|
285
257
|
|
|
286
258
|
Timber.d("hasExternalControllers = $hasExternalControllers")
|
|
@@ -289,13 +261,11 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
289
261
|
AppKilledPlaybackBehavior.PAUSE_PLAYBACK -> {
|
|
290
262
|
Timber.d("Pausing playback - appKilledPlaybackBehavior = $appKilledPlaybackBehavior")
|
|
291
263
|
player.pause()
|
|
292
|
-
// Service continues running for Android Auto
|
|
293
264
|
}
|
|
294
265
|
|
|
295
266
|
AppKilledPlaybackBehavior.STOP_PLAYBACK_AND_REMOVE_NOTIFICATION -> {
|
|
296
267
|
if (hasExternalControllers) {
|
|
297
268
|
Timber.d("External controllers still connected - deferring aggressive cleanup")
|
|
298
|
-
// Just pause and remove notification, but keep service alive for external controllers
|
|
299
269
|
player.pause()
|
|
300
270
|
stopForeground(STOP_FOREGROUND_REMOVE)
|
|
301
271
|
} else if (moduleBound) {
|
|
@@ -316,7 +286,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
316
286
|
stopSelf()
|
|
317
287
|
} catch (e: Exception) {
|
|
318
288
|
Timber.e(e, "Error during aggressive cleanup in onTaskRemoved")
|
|
319
|
-
// Still try to stop the service
|
|
320
289
|
stopSelf()
|
|
321
290
|
}
|
|
322
291
|
}
|
|
@@ -324,7 +293,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
324
293
|
|
|
325
294
|
AppKilledPlaybackBehavior.CONTINUE_PLAYBACK -> {
|
|
326
295
|
Timber.d("Continuing playback - service remains available for Android Auto")
|
|
327
|
-
// Service continues running for Android Auto with existing callbacks
|
|
328
296
|
}
|
|
329
297
|
}
|
|
330
298
|
}
|
|
@@ -359,11 +327,6 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
359
327
|
return super.onUnbind(intent)
|
|
360
328
|
}
|
|
361
329
|
|
|
362
|
-
/**
|
|
363
|
-
* Called when Android 12+ blocks a foreground service start from background. This happens when an
|
|
364
|
-
* external controller (Bluetooth, car head unit) tries to resume playback while the app is killed
|
|
365
|
-
* and battery restrictions are in place.
|
|
366
|
-
*/
|
|
367
330
|
@OptIn(UnstableApi::class)
|
|
368
331
|
override fun onForegroundServiceStartNotAllowedException() {
|
|
369
332
|
Timber.w("Foreground service start blocked by Android - recording battery warning")
|
|
@@ -372,9 +335,8 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
372
335
|
}
|
|
373
336
|
|
|
374
337
|
/**
|
|
375
|
-
* Cancels the artwork
|
|
376
|
-
*
|
|
377
|
-
* first. Must be called BEFORE player.destroy() on every teardown path.
|
|
338
|
+
* Cancels the artwork provider's scope and clears its holder. Idempotent. Call it before
|
|
339
|
+
* player.destroy() on every teardown path, so no in-flight load reaches a destroyed player.
|
|
378
340
|
*/
|
|
379
341
|
private fun tearDownArtworkProvider() {
|
|
380
342
|
artworkProviderDeps?.let {
|
|
@@ -387,15 +349,12 @@ class Service : MediaLibraryService(), MediaSessionService.Listener {
|
|
|
387
349
|
override fun onDestroy() {
|
|
388
350
|
Timber.d("onDestroy called")
|
|
389
351
|
|
|
390
|
-
// Unbind from HeadlessTaskService to avoid ServiceConnection leak.
|
|
391
352
|
// Unbinding a connection that never bound throws IllegalArgumentException.
|
|
392
353
|
if (headlessBound) {
|
|
393
354
|
unbindService(headlessConnection)
|
|
394
355
|
headlessBound = false
|
|
395
356
|
}
|
|
396
357
|
|
|
397
|
-
// Tear down artwork provider deps before player is destroyed so no in-flight
|
|
398
|
-
// coroutine can deref a torn-down player.
|
|
399
358
|
tearDownArtworkProvider()
|
|
400
359
|
|
|
401
360
|
Timber.d("Releasing media session and destroying player")
|
|
@@ -6,12 +6,8 @@ import android.content.ServiceConnection
|
|
|
6
6
|
import timber.log.Timber
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* `bindService` may be called from more than one place — an auto-bind at construction and again
|
|
12
|
-
* from setup — but the binding must be released exactly once, and only if one was ever taken:
|
|
13
|
-
* [Context.unbindService] throws when the connection was never registered. Kept apart from the
|
|
14
|
-
* caller so the rule is one object's job, and so it can be tested without a JSI runtime.
|
|
9
|
+
* Takes a [ServiceConnection]'s binding at most once, and releases it once and only if taken:
|
|
10
|
+
* [Context.unbindService] throws for a connection that was never registered.
|
|
15
11
|
*/
|
|
16
12
|
internal class ServiceBinding(private val context: Context) {
|
|
17
13
|
|
|
@@ -22,30 +18,26 @@ internal class ServiceBinding(private val context: Context) {
|
|
|
22
18
|
@Volatile private var bindSucceeded: Boolean = false
|
|
23
19
|
|
|
24
20
|
/**
|
|
25
|
-
* Binds
|
|
26
|
-
*
|
|
27
|
-
* returns the same answer: Android would otherwise count the extra bind and expect a matching
|
|
28
|
-
* unbind.
|
|
21
|
+
* Binds unless already bound, and returns what [Context.bindService] returned for the binding
|
|
22
|
+
* held: a second call while bound repeats that answer without binding again.
|
|
29
23
|
*/
|
|
30
24
|
fun bind(intent: Intent, connection: ServiceConnection): Boolean {
|
|
31
25
|
if (isBound) return bindSucceeded
|
|
32
|
-
//
|
|
33
|
-
//
|
|
34
|
-
// value, you should later call unbindService()".
|
|
26
|
+
// Bound even when bindService returns false: Android has already registered the connection,
|
|
27
|
+
// and "regardless of the return value, you should later call unbindService()".
|
|
35
28
|
isBound = true
|
|
36
29
|
bindSucceeded = context.bindService(intent, connection, Context.BIND_AUTO_CREATE)
|
|
37
30
|
return bindSucceeded
|
|
38
31
|
}
|
|
39
32
|
|
|
40
33
|
/**
|
|
41
|
-
* Releases the binding if one is held
|
|
42
|
-
*
|
|
43
|
-
* service went away, not that the binding did, so the unbind is still required.
|
|
34
|
+
* Releases the binding if one is held; a no-op otherwise. Still required after
|
|
35
|
+
* [ServiceConnection.onServiceDisconnected], which means the service died, not the binding.
|
|
44
36
|
*/
|
|
45
37
|
fun unbind(connection: ServiceConnection) {
|
|
46
38
|
if (!isBound) return
|
|
47
39
|
isBound = false
|
|
48
|
-
//
|
|
40
|
+
// A throw means the binding is already gone, which is the outcome wanted.
|
|
49
41
|
runCatching { context.unbindService(connection) }
|
|
50
42
|
.onFailure { Timber.w(it, "unbindService failed") }
|
|
51
43
|
}
|
|
@@ -4,14 +4,15 @@ import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
|
|
|
4
4
|
import com.margelo.nitro.audiobrowser.Track
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
*
|
|
8
|
-
* display-time bitmap loader
|
|
9
|
-
* re-running the
|
|
10
|
-
* transforms. Bounded LRU; thread-safe (
|
|
11
|
-
* scope, read from the bitmap loader's IO scope).
|
|
7
|
+
* Maps a produced artwork URI back to the Track and artwork config it came from, so the
|
|
8
|
+
* display-time bitmap loader, which gets only the URI from Media3, re-resolves Track-first with the
|
|
9
|
+
* real size instead of re-running the transform on an already-transformed URL (safe only for
|
|
10
|
+
* idempotent transforms). Bounded LRU; thread-safe (written from browse coroutines and the
|
|
11
|
+
* now-playing scope, read from the bitmap loader's IO scope).
|
|
12
12
|
*/
|
|
13
13
|
class ArtworkResolutionRegistry(private val maxEntries: Int = 256) {
|
|
14
14
|
|
|
15
|
+
/** A null [perRouteConfig] resolves through the browser's current `config.artwork`. */
|
|
15
16
|
data class Entry(val track: Track, val perRouteConfig: ArtworkRequestConfig?)
|
|
16
17
|
|
|
17
18
|
private val entries =
|
|
@@ -28,10 +29,10 @@ class ArtworkResolutionRegistry(private val maxEntries: Int = 256) {
|
|
|
28
29
|
@Synchronized fun lookup(uri: String): Entry? = entries[uri]
|
|
29
30
|
|
|
30
31
|
/**
|
|
31
|
-
* Drops all entries.
|
|
32
|
-
* entries
|
|
33
|
-
*
|
|
34
|
-
*
|
|
32
|
+
* Drops all entries. Call whenever the browser config is replaced or content is invalidated:
|
|
33
|
+
* entries hold Tracks and configs whose transform/resolve fields are Nitro handles to JS
|
|
34
|
+
* closures, and keeping them both retains dead closures and resolves artwork through stale
|
|
35
|
+
* callbacks.
|
|
35
36
|
*/
|
|
36
37
|
@Synchronized fun clear() = entries.clear()
|
|
37
38
|
}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
package com.audiobrowser.browser
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
|
-
* Token → resolved
|
|
5
|
-
*
|
|
6
|
-
* [ArtworkResolutionRegistry] it pins no JS closures and can be sized generously. Cleared when the
|
|
7
|
-
* browser config is replaced or content is invalidated, except for the [pin]ned entries: browse
|
|
8
|
-
* items are rebuilt after a clear, but the media items already in the queue keep their URIs.
|
|
9
|
-
* Thread-safe: written from browse coroutines, read from the provider's IO scope.
|
|
4
|
+
* Token → resolved artwork, the only data the [com.audiobrowser.util.ArtworkContentProvider]
|
|
5
|
+
* serves. Thread-safe: written from browse coroutines, read from the provider's IO scope.
|
|
10
6
|
*/
|
|
11
7
|
class BrowseArtworkRegistry(
|
|
8
|
+
// Entries hold plain data, no JS closures (unlike [ArtworkResolutionRegistry]), so they are cheap
|
|
9
|
+
// to keep many of.
|
|
12
10
|
private val maxEntries: Int = 2048,
|
|
13
11
|
private val maxPinnedEntries: Int = 2048,
|
|
14
12
|
) {
|
|
@@ -21,7 +19,10 @@ class BrowseArtworkRegistry(
|
|
|
21
19
|
entries[token] = artwork
|
|
22
20
|
}
|
|
23
21
|
|
|
24
|
-
/**
|
|
22
|
+
/**
|
|
23
|
+
* Registers artwork that [clear] keeps: browse items are rebuilt after a clear, but media items
|
|
24
|
+
* already in the queue keep their URIs.
|
|
25
|
+
*/
|
|
25
26
|
@Synchronized
|
|
26
27
|
fun pin(token: String, artwork: ResolvedArtwork) {
|
|
27
28
|
pinned[token] = artwork
|
|
@@ -29,9 +30,11 @@ class BrowseArtworkRegistry(
|
|
|
29
30
|
|
|
30
31
|
@Synchronized fun lookup(token: String): ResolvedArtwork? = entries[token] ?: pinned[token]
|
|
31
32
|
|
|
33
|
+
/** Drops the [register]ed entries; [pin]ned ones stay. */
|
|
32
34
|
@Synchronized fun clear() = entries.clear()
|
|
33
35
|
|
|
34
36
|
private fun lruMap(maxEntries: Int) =
|
|
37
|
+
// Access order, so a lookup keeps an entry from eviction.
|
|
35
38
|
object : LinkedHashMap<String, ResolvedArtwork>(16, 0.75f, true) {
|
|
36
39
|
override fun removeEldestEntry(
|
|
37
40
|
eldest: MutableMap.MutableEntry<String, ResolvedArtwork>
|
|
@@ -39,7 +42,7 @@ class BrowseArtworkRegistry(
|
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
44
|
|
|
42
|
-
/** Everything the provider needs to fetch one artwork
|
|
45
|
+
/** Everything the provider needs to fetch one artwork. */
|
|
43
46
|
data class ResolvedArtwork(
|
|
44
47
|
val finalUrl: String,
|
|
45
48
|
val headers: Map<String, String>?,
|