react-native-audio-browser 0.2.0-next.9 → 0.2.0-next.91
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/AudioBrowser.podspec +1 -1
- package/README.md +68 -39
- package/android/build.gradle +53 -14
- package/android/gradle.properties +3 -3
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +213 -0
- package/android/src/main/AndroidManifest.xml +14 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +582 -456
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +34 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +16 -2
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +126 -0
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +222 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +101 -104
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +15 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +30 -14
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +358 -541
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +36 -66
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +228 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +86 -64
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +52 -28
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +12 -19
- 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 +20 -11
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +18 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +11 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +25 -17
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +28 -42
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +23 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +12 -13
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +32 -27
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +92 -49
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +65 -0
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +67 -0
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +16 -19
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +113 -50
- package/android/src/main/java/com/audiobrowser/player/LiveStreamExtractor.kt +65 -0
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +49 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +75 -65
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +600 -345
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +108 -153
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +110 -116
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +62 -38
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +119 -132
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +686 -600
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +18 -28
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +171 -178
- package/android/src/main/java/com/audiobrowser/player/ReconnectPacer.kt +96 -0
- package/android/src/main/java/com/audiobrowser/player/RetryFocus.kt +126 -0
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +65 -210
- package/android/src/main/java/com/audiobrowser/player/RetryLocks.kt +52 -0
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +310 -0
- package/android/src/main/java/com/audiobrowser/player/RetryView.kt +31 -0
- package/android/src/main/java/com/audiobrowser/player/SessionViewListener.kt +168 -0
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +24 -0
- package/android/src/main/java/com/audiobrowser/player/SilenceBudget.kt +89 -0
- 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/TransformingDataSource.kt +53 -68
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +65 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +104 -0
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +42 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +117 -0
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +742 -0
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +105 -0
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +39 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +59 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +91 -0
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +98 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +69 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +128 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +538 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +97 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +203 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +15 -0
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +67 -0
- package/android/src/main/java/com/audiobrowser/sonos/SpeakerXml.kt +26 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +68 -0
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +61 -0
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +70 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +62 -43
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +151 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +53 -18
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +26 -13
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +231 -77
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +39 -0
- 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 +13 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +45 -0
- 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 +50 -93
- 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 +25 -24
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +10 -10
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +25 -56
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +39 -46
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -7
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- 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 +96 -83
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +16 -0
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +38 -0
- package/android/src/test/java/com/audiobrowser/AudioFixtures.kt +32 -0
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +151 -0
- package/android/src/test/java/com/audiobrowser/GateDecisionTest.kt +128 -0
- package/android/src/test/java/com/audiobrowser/LaunchSettledTest.kt +81 -0
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +90 -0
- package/android/src/test/java/com/audiobrowser/NetworkFixtures.kt +25 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputRoutesTest.kt +29 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +81 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +93 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +24 -4
- package/android/src/test/java/com/audiobrowser/ServiceFixtures.kt +48 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +290 -0
- package/android/src/test/java/com/audiobrowser/SessionPositionUpdatesTest.kt +114 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -42
- 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 +143 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerInvalidationTest.kt +172 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +87 -25
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +356 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +69 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +292 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +163 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +116 -53
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +149 -0
- package/android/src/test/java/com/audiobrowser/browser/TrackLoadHandlerTest.kt +44 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +37 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +36 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +70 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/model/PlayerSetupOptionsTest.kt +35 -0
- package/android/src/test/java/com/audiobrowser/player/AutomaticBufferManagerTest.kt +208 -0
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +459 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +4 -14
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +87 -0
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +12 -9
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +243 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +137 -0
- package/android/src/test/java/com/audiobrowser/player/LiveStreamEndTest.kt +316 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +102 -0
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingFormatterTest.kt +75 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +251 -21
- package/android/src/test/java/com/audiobrowser/player/PlayFromSearchTest.kt +108 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +90 -38
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +50 -0
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerBrowserTest.kt +62 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +172 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerDestroyTest.kt +60 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +66 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerRemoteOutputsSeekTest.kt +105 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +607 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupEndedTest.kt +195 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +147 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSleepTimerTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +235 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +354 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerTrackChangeTest.kt +222 -0
- package/android/src/test/java/com/audiobrowser/player/RetryCaseTest.kt +125 -0
- package/android/src/test/java/com/audiobrowser/player/RetryFocusTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +93 -200
- package/android/src/test/java/com/audiobrowser/player/RetryLocksTest.kt +48 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoopCaseTest.kt +181 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoopTest.kt +221 -0
- package/android/src/test/java/com/audiobrowser/player/RetryMaskingTest.kt +178 -0
- package/android/src/test/java/com/audiobrowser/player/SessionPlayTest.kt +212 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewListenerTest.kt +225 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewRulesTest.kt +62 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +234 -0
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +72 -0
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +149 -0
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +61 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +309 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteItemTest.kt +61 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteOutputsControllerTest.kt +77 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteQueueTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +1037 -0
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +201 -0
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +89 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +70 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +134 -0
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +169 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +176 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +690 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +129 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +199 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosStreamUriTest.kt +64 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +200 -0
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/sonos/ZoneGroupStateTest.kt +139 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +181 -15
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +315 -8
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +298 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +78 -1
- 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/AwaitCancellableTest.kt +136 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +51 -16
- 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/JsPromise.kt +44 -0
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +154 -0
- package/android/src/test/java/com/audiobrowser/util/NetworkConnectivityMonitorTest.kt +108 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +97 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -10
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +11 -13
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +91 -1
- package/android/src/test/resources/sonos/device_description.xml +78 -0
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +56 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +80 -0
- package/ios/AVPlayerEngine.swift +363 -0
- package/ios/AVPlayerEngineCallbacks.swift +12 -0
- package/ios/Browser/BrowseGate.swift +70 -0
- package/ios/Browser/BrowserConfig.swift +123 -104
- package/ios/Browser/BrowserError.swift +15 -0
- package/ios/Browser/BrowserManager.swift +153 -675
- package/ios/Browser/BrowserPathHelper.swift +54 -117
- package/ios/Browser/FavoriteSet.swift +43 -0
- package/ios/Browser/InertStyleDiagnostic.swift +231 -0
- package/ios/Browser/JsonModels.swift +244 -335
- package/ios/Browser/NavigationErrorState.swift +42 -0
- package/ios/Browser/PageResolver.swift +132 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +295 -0
- package/ios/Browser/SearchDrillIn.swift +10 -16
- package/ios/Browser/SectionScope.swift +73 -26
- package/ios/Browser/SimpleRouter.swift +76 -154
- package/ios/Browser/StyleResolver.swift +41 -0
- package/ios/Browser/TabBarEntries.swift +8 -7
- package/ios/Browser/TrackIdTemplate.swift +29 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +102 -61
- package/ios/CarPlay/CarPlayArtworkResolver.swift +32 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +85 -172
- package/ios/CarPlay/CarPlayListItemFactory.swift +240 -104
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +147 -218
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +93 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +185 -0
- package/ios/CarPlay/CarPlaySession.swift +203 -0
- package/ios/CarPlay/CarPlayTemplates.swift +62 -0
- package/ios/CarPlay/IntentHandlers.swift +94 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +91 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +15 -17
- package/ios/CarPlay/MediaIntentPlayback.swift +86 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +34 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +67 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +95 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +17 -10
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -16
- package/ios/Extension/Promise+AwaitCallback.swift +33 -0
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +14 -22
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +26 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +10 -14
- package/ios/Extension/Track+AVPlayer.swift +1 -18
- package/ios/Extension/Track+Copying.swift +13 -21
- package/ios/Extension/Track+Identity.swift +20 -0
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +19 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +73 -167
- package/ios/HybridAudioBrowser+Browser.swift +134 -0
- package/ios/HybridAudioBrowser+Options.swift +116 -0
- package/ios/HybridAudioBrowser+Player.swift +347 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +156 -0
- package/ios/HybridAudioBrowser+Stubs.swift +44 -0
- package/ios/HybridAudioBrowser.swift +147 -1718
- package/ios/Model/NitroTypeStubs.swift +266 -32
- package/ios/Model/PlayerUpdateOptions.swift +13 -19
- package/ios/Model/RemoteCommand.swift +6 -78
- package/ios/Model/TrackPlayerError.swift +12 -21
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +28 -82
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +92 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +41 -92
- package/ios/PlaybackEvent.swift +4 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +190 -0
- package/ios/Player/DeferredSeek.swift +73 -0
- package/ios/Player/ErrorStatus.swift +56 -0
- package/ios/Player/MediaLoader.swift +73 -98
- package/ios/Player/NowPlayingLines.swift +49 -0
- package/ios/Player/NowPlayingUpdater.swift +180 -105
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +121 -0
- package/ios/Player/PlaybackPersistence.swift +72 -0
- package/ios/Player/PlaybackStateMachine.swift +15 -14
- package/ios/Player/PlaybackTimer.swift +11 -8
- package/ios/Player/Player.swift +1030 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +109 -0
- package/ios/Player/PlayerStatusTypes.swift +1 -6
- package/ios/Player/QueueManager.swift +80 -98
- package/ios/Player/ReconnectPacer.swift +83 -0
- package/ios/Player/RetryLoop.swift +374 -0
- package/ios/Player/ShuffleOrder.swift +36 -43
- package/ios/Player/SilenceBudget.swift +78 -0
- package/ios/Player/SleepTimerManager.swift +25 -42
- package/ios/Player/VolumeFader.swift +20 -15
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -20
- package/ios/RemoteCommand/RemoteCommandController.swift +99 -337
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/ArtworkFreshnessTests.swift +67 -0
- package/ios/Tests/AwaitCallbackTests.swift +210 -0
- package/ios/Tests/BrowseGateTests.swift +50 -0
- package/ios/Tests/BrowserPathHelperTests.swift +89 -18
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/ConnectivityTests.swift +13 -0
- package/ios/Tests/DeferredSeekTests.swift +76 -0
- package/ios/Tests/EmitterTests.swift +22 -39
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +61 -0
- package/ios/Tests/GenerationMemoTests.swift +178 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +203 -0
- package/ios/Tests/JsonModelsTests.swift +189 -3
- package/ios/Tests/LRUCacheTests.swift +106 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +58 -52
- package/ios/Tests/MediaIntentDeadlineTests.swift +75 -0
- package/ios/Tests/MediaLoaderTests.swift +38 -78
- package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
- package/ios/Tests/NowPlayingLinesTests.swift +66 -0
- package/ios/Tests/ObserverTests.swift +88 -0
- package/ios/Tests/PlaybackErrorTests.swift +74 -0
- package/ios/Tests/PlaybackFailureTests.swift +188 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +94 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +7 -22
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerInvalidTrackTests.swift +65 -0
- package/ios/Tests/PlayerPolicyTests.swift +1386 -0
- package/ios/Tests/PlayerTests.swift +1677 -0
- package/ios/Tests/PlayingStateTests.swift +41 -0
- package/ios/Tests/QueueManagerTests.swift +205 -174
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +65 -48
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -37
- package/ios/Tests/RetryCaseTests.swift +146 -0
- package/ios/Tests/RetryLoopTests.swift +486 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -17
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +85 -0
- package/ios/Tests/SectionScopeTests.swift +136 -54
- package/ios/Tests/SimpleRouterTests.swift +39 -8
- package/ios/Tests/SleepTimerManagerTests.swift +68 -47
- package/ios/Tests/StyleResolverTests.swift +123 -0
- package/ios/Tests/SupersedingTaskTests.swift +148 -0
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +236 -93
- package/ios/Tests/Support/TimeLimit.swift +43 -0
- package/ios/Tests/TabBarEntriesTests.swift +18 -20
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +43 -2
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +63 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +157 -34
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +67 -77
- package/ios/Util/ArtworkFreshness.swift +42 -0
- package/ios/Util/ArtworkImageFetcher.swift +143 -6
- package/ios/Util/AwaitCallback.swift +80 -0
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Connectivity.swift +12 -0
- package/ios/Util/Deadline.swift +38 -0
- package/ios/Util/Emitter.swift +45 -22
- package/ios/Util/GenerationMemo.swift +43 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +31 -33
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +57 -0
- package/ios/Util/SFSymbolRenderer.swift +64 -49
- package/ios/Util/SVGProcessor.swift +9 -16
- package/ios/Util/SupersedingTask.swift +45 -0
- package/lib/commonjs/AudioBrowser.js +11 -0
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +57 -0
- package/lib/commonjs/features/battery.js +16 -12
- package/lib/commonjs/features/battery.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +13 -9
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +78 -20
- 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 +28 -23
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +27 -6
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +61 -11
- 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 +9 -4
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +13 -6
- 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 +13 -6
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +5 -6
- 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 +44 -43
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +3 -4
- package/lib/commonjs/features/player/validateOptions.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +14 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +56 -21
- 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 +23 -6
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
- package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
- package/lib/commonjs/utils/LazyNativeEmitter.js +18 -10
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +32 -16
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +26 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useDebug.js +16 -3
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/utils/useNativeUpdatedValue.js +12 -20
- package/lib/commonjs/utils/useNativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +38 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +207 -84
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/Player.js +256 -40
- package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +34 -14
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +175 -100
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +18 -23
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.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 +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
- package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +60 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -4
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +57 -0
- package/lib/module/features/battery.js +16 -12
- package/lib/module/features/battery.js.map +1 -1
- package/lib/module/features/browser-config.js +13 -9
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +78 -20
- 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 +28 -23
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +27 -6
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +59 -11
- 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 +9 -4
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +13 -6
- 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 +13 -6
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/features/playback/state.js +5 -6
- 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 +44 -43
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +3 -4
- package/lib/module/features/player/validateOptions.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +14 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +56 -21
- 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 +24 -7
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/test-utils/reactNativeStub.js +58 -0
- package/lib/module/test-utils/reactNativeStub.js.map +1 -0
- package/lib/module/utils/LazyNativeEmitter.js +18 -10
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +32 -16
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +22 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useDebug.js +16 -3
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/utils/useNativeUpdatedValue.js +13 -21
- package/lib/module/utils/useNativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/useNativeValueRefreshedBy.js +34 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +207 -84
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
- package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/module/web/TrackPlayer/Player.js +256 -40
- package/lib/module/web/TrackPlayer/Player.js.map +1 -1
- package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueuePlayer.js +34 -14
- package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +175 -100
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/NavigationErrorManager.js +3 -1
- package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +18 -23
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.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 +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/http/RequestConfigBuilder.js +110 -27
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/http/followMediaRedirect.js +215 -0
- package/lib/module/web/http/followMediaRedirect.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +60 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/package.json +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts.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-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +67 -19
- 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 +28 -23
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +29 -8
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +65 -14
- 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 +9 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +13 -6
- 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/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +10 -6
- 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 +73 -56
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +129 -73
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +50 -19
- 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/specs/audio-browser.nitro.d.ts +3 -4
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
- package/lib/typescript/src/types/browser-native.d.ts +3 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +401 -143
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +248 -173
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +13 -17
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +17 -20
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +20 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
- package/lib/typescript/src/utils/resolveAssetSource.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/lib/typescript/src/utils/useNativeUpdatedValue.d.ts +4 -4
- package/lib/typescript/src/utils/useNativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +20 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
- package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
- package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
- package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +4 -7
- package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
- package/nitrogen/generated/android/c++/JGate.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
- package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +77 -44
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +4 -3
- package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
- package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +21 -12
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
- package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
- package/nitrogen/generated/android/c++/JOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +8 -2
- package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
- package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +10 -10
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteOutputsOptions.hpp +66 -0
- package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
- package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JSection.hpp +116 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
- package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
- package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
- package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
- package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +25 -15
- package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
- package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +7 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +39 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +3 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteOutputsOptions.kt +61 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
- package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +800 -644
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +31 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +41 -12
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +2 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +20 -2
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
- package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/OutputType.swift +8 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/RemoteOutputsOptions.swift +78 -0
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
- package/nitrogen/generated/ios/swift/Section.swift +82 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
- package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +28 -63
- package/nitrogen/generated/ios/swift/TrackLoadEvent.swift +20 -2
- package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
- package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
- package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
- package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +2 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +2 -1
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
- package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/OutputType.hpp +9 -1
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/RemoteOutputsOptions.hpp +92 -0
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
- package/nitrogen/generated/shared/c++/Section.hpp +102 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +18 -30
- package/nitrogen/generated/shared/c++/TrackLoadEvent.hpp +7 -2
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
- package/package.json +27 -13
- package/src/AudioBrowser.ts +2 -4
- package/src/CLAUDE.md +57 -0
- package/src/docs-floors.test.ts +71 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/battery.ts +17 -13
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +13 -9
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +69 -20
- 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 +28 -23
- package/src/features/gate.ts +29 -8
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +80 -14
- package/src/features/network.ts +5 -1
- package/src/features/nowPlaying.ts +28 -14
- package/src/features/output.ts +9 -4
- package/src/features/playback/controls.ts +13 -6
- package/src/features/playback/playWhenReady.ts +6 -5
- package/src/features/playback/playing.ts +16 -3
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +13 -6
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +10 -6
- package/src/features/playback/trackPlaybackTime.test.ts +1 -5
- package/src/features/playback/trackPlaybackTime.ts +9 -2
- package/src/features/playback/volume.ts +6 -5
- package/src/features/player/options.ts +81 -62
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +141 -76
- package/src/features/player/validateOptions.ts +3 -4
- package/src/features/queue/activeTrack.ts +14 -4
- package/src/features/queue/queue.ts +56 -21
- 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.test.ts +171 -0
- package/src/features/sleepTimer.ts +24 -8
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +48 -24
- package/src/specs/audio-browser.nitro.ts +15 -8
- package/src/style-resolution.test.ts +210 -0
- package/src/test-utils/reactNativeStub.ts +60 -0
- package/src/types/browser-native.ts +7 -3
- package/src/types/browser-nodes.ts +417 -151
- package/src/types/browser.ts +254 -177
- package/src/utils/LazyNativeEmitter.ts +17 -10
- package/src/utils/NativeUpdatedValue.ts +30 -16
- package/src/utils/getTrackIdentity.ts +22 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useDebug.ts +16 -3
- package/src/utils/useNativeUpdatedValue.test.ts +111 -0
- package/src/utils/useNativeUpdatedValue.ts +13 -17
- package/src/utils/useNativeValueRefreshedBy.test.ts +68 -0
- package/src/utils/useNativeValueRefreshedBy.ts +45 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +247 -92
- package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
- package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
- package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
- package/src/web/TrackPlayer/Player.dispatch.test.ts +50 -5
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +286 -38
- package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
- package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/src/web/TrackPlayer/QueuePlayer.ts +34 -16
- package/src/web/__tests__/lifecycle.test.ts +345 -0
- package/src/web/__tests__/lifecycleHarness.ts +351 -0
- package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
- package/src/web/__tests__/loadSupersession.test.ts +175 -0
- package/src/web/__tests__/retry.test.ts +169 -0
- package/src/web/browser/BrowserManager.ts +209 -111
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/NavigationErrorManager.ts +3 -1
- package/src/web/browser/SearchManager.test.ts +75 -0
- package/src/web/browser/SearchManager.ts +25 -28
- package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
- package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
- package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/parseSearchResponse.ts +3 -4
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/http/RequestConfigBuilder.test.ts +241 -1
- package/src/web/http/RequestConfigBuilder.ts +140 -33
- package/src/web/http/followMediaRedirect.test.ts +289 -0
- package/src/web/http/followMediaRedirect.ts +253 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +68 -0
- package/src/web/util/BrowserPathHelper.ts +68 -13
- package/website/guide/android-auto.md +126 -0
- package/website/guide/android-certificates.md +488 -0
- package/website/guide/artwork.md +300 -0
- package/website/guide/audio-output.md +382 -0
- package/website/guide/automotive.md +91 -0
- package/website/guide/basic-usage.md +154 -0
- package/website/guide/battery.md +142 -0
- package/website/guide/browser.md +674 -0
- package/website/guide/carplay.md +733 -0
- package/website/guide/configuration.md +215 -0
- package/website/guide/equalizer.md +235 -0
- package/website/guide/errors.md +359 -0
- package/website/guide/favorites.md +164 -0
- package/website/guide/gate.md +157 -0
- package/website/guide/getting-started.md +99 -0
- package/website/guide/hooks.md +247 -0
- package/website/guide/live-streams.md +189 -0
- package/website/guide/metadata.md +289 -0
- package/website/guide/migrating-from-track-player.md +289 -0
- package/website/guide/native-callback-fetch.md +137 -0
- package/website/guide/network.md +103 -0
- package/website/guide/now-playing.md +203 -0
- package/website/guide/playback.md +405 -0
- package/website/guide/queue.md +334 -0
- package/website/guide/remote-controls.md +314 -0
- package/website/guide/search.md +270 -0
- package/website/guide/sleep-timer.md +289 -0
- package/website/guide/track.md +271 -0
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +0 -50
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -68
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +0 -40
- package/ios/Bridge.h +0 -8
- package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
- package/ios/Browser/MediaResolveComposer.swift +0 -114
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
- package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
- package/ios/Model/MediaURL.swift +0 -67
- package/ios/Model/SourceType.swift +0 -6
- package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
- package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
- package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
- package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
- package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
- package/ios/Observer/PlayerStateObserver.swift +0 -50
- package/ios/Observer/PlayerTimeObserver.swift +0 -55
- package/ios/Option/PitchAlgorithms.swift +0 -17
- package/ios/Option/TimeEventFrequency.swift +0 -18
- package/ios/Player/EndOfTrackJudgement.swift +0 -32
- package/ios/Player/LoadSeekCoordinator.swift +0 -99
- package/ios/Player/MediaIntentCriteria.swift +0 -139
- package/ios/Player/MediaLoaderDelegate.swift +0 -11
- package/ios/Player/PlaybackCoordinator.swift +0 -754
- package/ios/Player/PlaybackEffectHandler.swift +0 -54
- package/ios/Player/PlaybackErrorHandler.swift +0 -175
- package/ios/Player/PlaybackStateStore.swift +0 -27
- package/ios/Player/PlayingStateManager.swift +0 -33
- package/ios/Player/RetryManager.swift +0 -323
- package/ios/Player/SeekCompletionHandler.swift +0 -3
- package/ios/Player/SleepTimerHandling.swift +0 -15
- package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
- package/ios/Tests/EndOfTrackJudgementTests.swift +0 -35
- package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -327
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackCoordinatorTests.swift +0 -1260
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RemoteCommandTests.swift +0 -67
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -53
- package/ios/Util/MetadataAdapter.swift +0 -131
- package/ios/Util/OnceValue.swift +0 -104
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -20,9 +20,11 @@ import com.audiobrowser.browser.CallbackException
|
|
|
20
20
|
import com.audiobrowser.browser.ContentNotFoundException
|
|
21
21
|
import com.audiobrowser.browser.HttpStatusException
|
|
22
22
|
import com.audiobrowser.browser.NetworkException
|
|
23
|
+
import com.audiobrowser.browser.flattenedChildren
|
|
23
24
|
import com.audiobrowser.browser.handleTrackLoad
|
|
24
25
|
import com.audiobrowser.browser.resolveMediaUrl
|
|
25
26
|
import com.audiobrowser.extension.NumberExt.Companion.toSeconds
|
|
27
|
+
import com.audiobrowser.extension.indexOfTappedTrack
|
|
26
28
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
27
29
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
28
30
|
import com.audiobrowser.player.Player
|
|
@@ -32,9 +34,12 @@ import com.audiobrowser.util.BrowserPathHelper
|
|
|
32
34
|
import com.audiobrowser.util.OutputMonitor
|
|
33
35
|
import com.audiobrowser.util.OutputSwitcher
|
|
34
36
|
import com.audiobrowser.util.SystemVolumeMonitor
|
|
37
|
+
import com.audiobrowser.util.awaitNestedOrTimeout
|
|
38
|
+
import com.audiobrowser.util.awaitOrTimeout
|
|
35
39
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
36
40
|
import com.google.common.util.concurrent.ListenableFuture
|
|
37
41
|
import com.margelo.nitro.NitroModules
|
|
42
|
+
import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
|
|
38
43
|
import com.margelo.nitro.audiobrowser.BatteryOptimizationStatus
|
|
39
44
|
import com.margelo.nitro.audiobrowser.BatteryOptimizationStatusChangedEvent
|
|
40
45
|
import com.margelo.nitro.audiobrowser.BatteryWarningPendingChangedEvent
|
|
@@ -50,6 +55,7 @@ import com.margelo.nitro.audiobrowser.HybridAudioBrowserSpec
|
|
|
50
55
|
import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
51
56
|
import com.margelo.nitro.audiobrowser.NativeBrowserConfiguration
|
|
52
57
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
58
|
+
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
53
59
|
import com.margelo.nitro.audiobrowser.NativeSetupPlayerOptions
|
|
54
60
|
import com.margelo.nitro.audiobrowser.NativeUpdateOptions
|
|
55
61
|
import com.margelo.nitro.audiobrowser.NavigationError
|
|
@@ -82,17 +88,22 @@ import com.margelo.nitro.audiobrowser.SleepTimer
|
|
|
82
88
|
import com.margelo.nitro.audiobrowser.TimedMetadata
|
|
83
89
|
import com.margelo.nitro.audiobrowser.Track
|
|
84
90
|
import com.margelo.nitro.audiobrowser.TrackMetadata
|
|
91
|
+
import com.margelo.nitro.audiobrowser.TransformableRequestConfig
|
|
92
|
+
import com.margelo.nitro.core.NullType
|
|
85
93
|
import com.margelo.nitro.core.Promise
|
|
86
94
|
import java.util.concurrent.TimeUnit
|
|
87
|
-
import
|
|
88
|
-
import kotlin.coroutines.resumeWithException
|
|
89
|
-
import kotlin.coroutines.suspendCoroutine
|
|
95
|
+
import java.util.concurrent.atomic.AtomicReference
|
|
90
96
|
import kotlinx.coroutines.CancellationException
|
|
97
|
+
import kotlinx.coroutines.CompletableDeferred
|
|
98
|
+
import kotlinx.coroutines.CoroutineScope
|
|
99
|
+
import kotlinx.coroutines.CoroutineStart
|
|
100
|
+
import kotlinx.coroutines.DelicateCoroutinesApi
|
|
91
101
|
import kotlinx.coroutines.Job
|
|
92
102
|
import kotlinx.coroutines.MainScope
|
|
93
103
|
import kotlinx.coroutines.cancel
|
|
94
104
|
import kotlinx.coroutines.cancelChildren
|
|
95
|
-
import kotlinx.coroutines.
|
|
105
|
+
import kotlinx.coroutines.currentCoroutineContext
|
|
106
|
+
import kotlinx.coroutines.ensureActive
|
|
96
107
|
import kotlinx.coroutines.launch
|
|
97
108
|
import kotlinx.coroutines.runBlocking
|
|
98
109
|
import timber.log.Timber
|
|
@@ -102,39 +113,70 @@ import timber.log.Timber
|
|
|
102
113
|
class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
103
114
|
|
|
104
115
|
/**
|
|
105
|
-
*
|
|
116
|
+
* Runs on an explicit JS `dispose()` and, through [disposeCurrent], on runtime teardown, which
|
|
117
|
+
* Nitro itself never reports.
|
|
106
118
|
*
|
|
107
|
-
* The Service outlives this object, so everything registered in `init` or on connect
|
|
108
|
-
*
|
|
109
|
-
*
|
|
110
|
-
*
|
|
119
|
+
* The Service outlives this object, so everything registered in `init` or on connect is undone
|
|
120
|
+
* here; left alone, the running [Player] calls into a dead JSI runtime and each reload strands a
|
|
121
|
+
* ServiceConnection and lifecycle observer. The teardown is posted to main, where
|
|
122
|
+
* [onServiceConnected] and [onServiceDisconnected] write the same state; dispose itself arrives
|
|
123
|
+
* on the JS thread or the teardown callback's thread.
|
|
111
124
|
*/
|
|
112
125
|
override fun dispose() {
|
|
126
|
+
current.compareAndSet(this, null)
|
|
113
127
|
systemVolumeMonitor.destroy()
|
|
114
128
|
outputMonitor.destroy()
|
|
129
|
+
// Only when still ours: on a reload the replacement may already own the slot.
|
|
130
|
+
carConnectionTarget.compareAndSet(onCarConnectedChanged, null)
|
|
131
|
+
|
|
132
|
+
dropStaleJSCallbacks()
|
|
133
|
+
|
|
134
|
+
handler.post {
|
|
135
|
+
connectedService?.let { service ->
|
|
136
|
+
// Identity-guarded: both instances bind to the same singleton Service, so a late dispose
|
|
137
|
+
// must not strip the wiring a replacement has already installed.
|
|
138
|
+
if (service.player.getCallbacks() === callbacks) service.player.setCallbacks(null)
|
|
139
|
+
if (service.player.browser === this) {
|
|
140
|
+
service.player.browser = null
|
|
141
|
+
// It wraps a JS callback from this runtime: left set, every track change throws into the
|
|
142
|
+
// now-playing updater's fallback until the next setup().
|
|
143
|
+
service.player.nowPlaying.formatter = null
|
|
144
|
+
}
|
|
145
|
+
if (service.onBatteryWarningPendingChanged === onBatteryWarningPending) {
|
|
146
|
+
service.onBatteryWarningPendingChanged = null
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
connectedService = null
|
|
115
150
|
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}
|
|
121
|
-
connectedService = null
|
|
122
|
-
mediaBrowserFuture = null
|
|
123
|
-
|
|
124
|
-
serviceBinding.unbind(this)
|
|
125
|
-
|
|
126
|
-
// Only when still ours: on a reload the replacement instance may already own the slot.
|
|
127
|
-
if (carConnectionTarget === onCarConnectedChanged) carConnectionTarget = null
|
|
151
|
+
// Dropping the reference disconnects nothing: the controller stays in the session's
|
|
152
|
+
// connected list, holding a binder and a listener.
|
|
153
|
+
mediaBrowserFuture?.let { MediaBrowser.releaseFuture(it) }
|
|
154
|
+
mediaBrowserFuture = null
|
|
128
155
|
|
|
129
|
-
|
|
130
|
-
// which is why the observer is added the same way.
|
|
131
|
-
handler.removeCallbacksAndMessages(null)
|
|
132
|
-
handler.post { ProcessLifecycleOwner.get().lifecycle.removeObserver(lifecycleObserver) }
|
|
156
|
+
serviceBinding.unbind(this)
|
|
133
157
|
|
|
134
|
-
|
|
158
|
+
ProcessLifecycleOwner.get().lifecycle.removeObserver(lifecycleObserver)
|
|
159
|
+
// Inside this post: run from dispose() after the post, it would drop the teardown itself.
|
|
160
|
+
handler.removeCallbacksAndMessages(null)
|
|
161
|
+
mainScope.cancel()
|
|
162
|
+
}
|
|
135
163
|
super.dispose()
|
|
136
164
|
}
|
|
137
165
|
|
|
166
|
+
/**
|
|
167
|
+
* Strips every JS function from the config, at every depth, and reverts [resolveGate]: anything
|
|
168
|
+
* still holding this instance (an in-flight browse, the running player) can invoke them after the
|
|
169
|
+
* runtime is gone. Those paths then degrade like a config that never had callbacks (static
|
|
170
|
+
* layers, default error copy, fail-closed gate) instead of throwing into the error path. The
|
|
171
|
+
* now-playing formatter is cleared in [dispose]. Mirrors iOS `dropStaleJSCallbacks`, where the
|
|
172
|
+
* same invoke is fatal rather than a throw.
|
|
173
|
+
*/
|
|
174
|
+
private fun dropStaleJSCallbacks() {
|
|
175
|
+
_configuration = _configuration.strippingJSCallbacks()
|
|
176
|
+
browserManager.config = buildConfig()
|
|
177
|
+
resolveGate = defaultResolveGate
|
|
178
|
+
}
|
|
179
|
+
|
|
138
180
|
private val mainScope = MainScope()
|
|
139
181
|
private var navigationJob: Job? = null
|
|
140
182
|
private val handler = Handler(Looper.getMainLooper())
|
|
@@ -143,6 +185,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
143
185
|
?: throw IllegalStateException("NitroModules.applicationContext is null")
|
|
144
186
|
|
|
145
187
|
// MARK: Browser state
|
|
188
|
+
private var isConfigured = false
|
|
146
189
|
private var _configuration =
|
|
147
190
|
NativeBrowserConfiguration(
|
|
148
191
|
path = null,
|
|
@@ -157,8 +200,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
157
200
|
singleTrack = null,
|
|
158
201
|
handleTrackLoad = null,
|
|
159
202
|
androidControllerOfflineError = null,
|
|
203
|
+
viewMoreTitle = null,
|
|
160
204
|
carPlayLoadingTitle = null,
|
|
161
|
-
|
|
205
|
+
resolveAlbumPath = null,
|
|
162
206
|
formatNavigationError = null,
|
|
163
207
|
)
|
|
164
208
|
|
|
@@ -177,17 +221,26 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
177
221
|
private var updateOptions: PlayerUpdateOptions = PlayerUpdateOptions()
|
|
178
222
|
private var mediaBrowserFuture: ListenableFuture<MediaBrowser>? = null
|
|
179
223
|
private var setupOptions = PlayerSetupOptions()
|
|
180
|
-
|
|
224
|
+
// Written only on main (ServiceConnection callbacks, dispose); read on main and, in places,
|
|
225
|
+
// straight from the JS thread, where it may be stale either way: a just-detached service, or
|
|
226
|
+
// null while onServiceConnected is pending. Keep writes on main; no read-modify-write.
|
|
227
|
+
@Volatile private var connectedService: Service? = null
|
|
181
228
|
|
|
182
229
|
private val serviceBinding = ServiceBinding(context)
|
|
183
|
-
private var setupPromise: ((Unit) -> Unit)? = null
|
|
184
230
|
|
|
185
|
-
//
|
|
186
|
-
|
|
231
|
+
// Held rather than inlined so [dispose] can tell its own wiring from a replacement's.
|
|
232
|
+
private val onBatteryWarningPending: (Boolean) -> Unit = { pending ->
|
|
233
|
+
post { onBatteryWarningPendingChanged(BatteryWarningPendingChangedEvent(pending)) }
|
|
234
|
+
}
|
|
235
|
+
// Every setupPlayer waiting for the service awaits it. Replaced on disconnect, after
|
|
236
|
+
// cancelChildren has rejected its waiters, and on a dead binding, after failing them.
|
|
237
|
+
private var connectionReady = CompletableDeferred<Unit>()
|
|
238
|
+
|
|
239
|
+
// Staged by setup options or by setters called before the player exists; last write wins, and
|
|
240
|
+
// [applyPendingPlayerState] consumes them.
|
|
187
241
|
private var pendingPlayWhenReady: Boolean? = null
|
|
188
242
|
private var pendingRepeatMode: RepeatMode? = null
|
|
189
243
|
|
|
190
|
-
/** Post callback to main handler for consistent async delivery to JS - avoids deadlocks */
|
|
191
244
|
private fun post(block: () -> Unit) = handler.post(block)
|
|
192
245
|
|
|
193
246
|
// MARK: Browser callbacks
|
|
@@ -198,14 +251,11 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
198
251
|
override var onFormattedNavigationError: (FormattedNavigationError?) -> Unit = {}
|
|
199
252
|
|
|
200
253
|
// MARK: Gate callbacks (native→JS; set from JS, native CALLS them)
|
|
201
|
-
//
|
|
202
|
-
//
|
|
203
|
-
//
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
override var resolveGate: (request: NativeGateRequest) -> Promise<Promise<GateDecision>> = {
|
|
207
|
-
Promise.resolved(Promise.resolved(GateDecision(gated = true, gate = null)))
|
|
208
|
-
}
|
|
254
|
+
// Denies by default: it is reached only while a resolver is declared but none from a live
|
|
255
|
+
// runtime is bound (before JS assigns one, or after [dispose] reverts it), and an active gate
|
|
256
|
+
// must not serve content in that window.
|
|
257
|
+
override var resolveGate: (request: NativeGateRequest) -> Promise<Promise<GateDecision>> =
|
|
258
|
+
defaultResolveGate
|
|
209
259
|
override var onGate: (event: GateEvent) -> Unit = {}
|
|
210
260
|
|
|
211
261
|
// MARK: Player callbacks
|
|
@@ -260,7 +310,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
260
310
|
override var handleRemoteSkip: (() -> Unit)? = null
|
|
261
311
|
override var handleRemoteStop: (() -> Unit)? = null
|
|
262
312
|
|
|
263
|
-
/** Lifecycle observer to check battery status when app comes to foreground */
|
|
264
313
|
private val lifecycleObserver =
|
|
265
314
|
object : DefaultLifecycleObserver {
|
|
266
315
|
override fun onStart(owner: LifecycleOwner) {
|
|
@@ -269,7 +318,8 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
269
318
|
}
|
|
270
319
|
|
|
271
320
|
init {
|
|
272
|
-
|
|
321
|
+
current.set(this)
|
|
322
|
+
|
|
273
323
|
launchInScope {
|
|
274
324
|
try {
|
|
275
325
|
Timber.d("Attempting to auto-bind to existing AudioBrowserService from AudioBrowser")
|
|
@@ -285,18 +335,14 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
285
335
|
}
|
|
286
336
|
}
|
|
287
337
|
|
|
288
|
-
//
|
|
289
|
-
// Must run on main thread as required by LifecycleRegistry.addObserver
|
|
338
|
+
// LifecycleRegistry.addObserver asserts the main thread.
|
|
290
339
|
handler.post { ProcessLifecycleOwner.get().lifecycle.addObserver(lifecycleObserver) }
|
|
291
340
|
|
|
292
|
-
// Observe system volume changes
|
|
293
341
|
systemVolumeMonitor.setOnVolumeChanged { volume -> post { onSystemVolumeChanged(volume) } }
|
|
294
342
|
|
|
295
|
-
// Observe current audio output changes (active media route via AudioManager)
|
|
296
343
|
outputMonitor.setOnOutputChanged { output -> post { onOutputChanged(output) } }
|
|
297
344
|
outputMonitor.start()
|
|
298
345
|
|
|
299
|
-
// Observe the car connection (Android Auto / Android Automotive)
|
|
300
346
|
startCarConnectionObserver(context, handler)
|
|
301
347
|
}
|
|
302
348
|
|
|
@@ -316,18 +362,18 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
316
362
|
routes = _configuration.routes,
|
|
317
363
|
singleTrack = _configuration.singleTrack ?: false,
|
|
318
364
|
androidControllerOfflineError = _configuration.androidControllerOfflineError ?: true,
|
|
365
|
+
viewMoreTitle = _configuration.viewMoreTitle,
|
|
319
366
|
)
|
|
320
367
|
}
|
|
321
368
|
|
|
322
369
|
/**
|
|
323
|
-
*
|
|
324
|
-
*
|
|
325
|
-
*
|
|
326
|
-
* safe and intentional.
|
|
370
|
+
* The request config for [originalUrl], or null when resolution fails. Blocks: it is called from
|
|
371
|
+
* [com.audiobrowser.player.TransformingDataSource.open] on ExoPlayer's loading thread, never main
|
|
372
|
+
* or JS.
|
|
327
373
|
*/
|
|
328
|
-
fun getMediaRequestConfig(originalUrl: String): MediaRequestConfig? {
|
|
374
|
+
fun getMediaRequestConfig(originalUrl: String, track: Track): MediaRequestConfig? {
|
|
329
375
|
return try {
|
|
330
|
-
runBlocking { browserManager.resolveMediaUrl(originalUrl) }
|
|
376
|
+
runBlocking { browserManager.resolveMediaUrl(originalUrl, track) }
|
|
331
377
|
} catch (e: Exception) {
|
|
332
378
|
Timber.e(e, "Failed to transform media URL: $originalUrl")
|
|
333
379
|
null
|
|
@@ -335,28 +381,25 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
335
381
|
}
|
|
336
382
|
|
|
337
383
|
private fun hasValidConfiguration(): Boolean {
|
|
338
|
-
// Need at least one browsable route (not just search)
|
|
339
384
|
return _configuration.routes?.any { it.path != BrowserManager.SEARCH_ROUTE_PATH } == true
|
|
340
385
|
}
|
|
341
386
|
|
|
342
|
-
//
|
|
343
|
-
//
|
|
344
|
-
//
|
|
345
|
-
// setter, which runs on the JS thread and would deadlock (the JS thread blocks
|
|
346
|
-
// waiting for callbacks that need that same thread to run).
|
|
387
|
+
// Suspends because queryTabs() invokes JS callbacks, which run on the JS thread. Never call it
|
|
388
|
+
// through runBlocking from a Nitro setter: that runs on the JS thread and deadlocks waiting for
|
|
389
|
+
// callbacks that need it.
|
|
347
390
|
private suspend fun getDefaultPath(): String? {
|
|
348
391
|
return try {
|
|
349
392
|
browserManager.config = buildConfig()
|
|
350
393
|
val tabs = browserManager.queryTabs()
|
|
351
394
|
if (tabs.isNotEmpty()) {
|
|
352
|
-
Timber.d("Using first tab as default path: ${tabs[0].
|
|
353
|
-
tabs[0].
|
|
395
|
+
Timber.d("Using first tab as default path: ${tabs[0].path}")
|
|
396
|
+
tabs[0].path
|
|
354
397
|
} else {
|
|
355
398
|
Timber.d("Using root path as default: /")
|
|
356
399
|
"/"
|
|
357
400
|
}
|
|
358
401
|
} catch (e: CancellationException) {
|
|
359
|
-
throw e
|
|
402
|
+
throw e
|
|
360
403
|
} catch (e: Exception) {
|
|
361
404
|
Timber.e(e, "Failed to get default path, falling back to /")
|
|
362
405
|
"/"
|
|
@@ -374,19 +417,15 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
374
417
|
browserManager.config = buildConfig()
|
|
375
418
|
clearNavigationError()
|
|
376
419
|
|
|
377
|
-
// Cancel previous navigation to avoid race conditions
|
|
378
420
|
navigationJob?.cancel()
|
|
379
421
|
|
|
380
|
-
// Resolve the default path inside the coroutine (getDefaultPath queries
|
|
381
|
-
// tabs via JS callbacks) so it never blocks the JS thread this setter
|
|
382
|
-
// runs on.
|
|
383
422
|
navigationJob =
|
|
384
423
|
mainScope.launch {
|
|
385
424
|
val path = value ?: getDefaultPath() ?: return@launch
|
|
386
425
|
try {
|
|
387
426
|
browserManager.navigate(path)
|
|
388
427
|
} catch (e: CancellationException) {
|
|
389
|
-
throw e
|
|
428
|
+
throw e
|
|
390
429
|
} catch (e: Exception) {
|
|
391
430
|
handleBrowserException(e, path, "setting path: $path")
|
|
392
431
|
}
|
|
@@ -403,28 +442,29 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
403
442
|
set(value) {
|
|
404
443
|
_configuration = value
|
|
405
444
|
browserManager.config = buildConfig()
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
//
|
|
409
|
-
|
|
445
|
+
browserManager.clearContentCache()
|
|
446
|
+
|
|
447
|
+
// Reaches MediaSession, which asserts the main thread, from this JS-thread setter. Launched,
|
|
448
|
+
// not blocked: what it triggers can wait on JS callbacks, which cannot run while the JS
|
|
449
|
+
// thread waits. Queued on mainScope ahead of navigationJob, so the two stay ordered.
|
|
450
|
+
launchInScope {
|
|
451
|
+
// Here, not in the setter: onServiceConnected reads it on main, and must not see it before
|
|
452
|
+
// browserManager.config is set.
|
|
453
|
+
isConfigured = true
|
|
454
|
+
connectedService?.player?.notifyBrowserConfigurationReady()
|
|
455
|
+
}
|
|
410
456
|
|
|
411
457
|
clearNavigationError()
|
|
412
458
|
|
|
413
|
-
// Cancel previous navigation to avoid race conditions
|
|
414
459
|
navigationJob?.cancel()
|
|
415
460
|
|
|
416
|
-
// Navigate to the initial path, or default to the first tab. The default
|
|
417
|
-
// path is resolved inside the coroutine (getDefaultPath queries tabs via
|
|
418
|
-
// JS callbacks) so it never blocks the JS thread this setter runs on —
|
|
419
|
-
// doing it synchronously here via runBlocking deadlocked: the JS callbacks
|
|
420
|
-
// can't run because the JS thread is blocked waiting for them.
|
|
421
461
|
navigationJob =
|
|
422
462
|
mainScope.launch {
|
|
423
463
|
val path = value.path ?: getDefaultPath() ?: return@launch
|
|
424
464
|
try {
|
|
425
465
|
browserManager.navigate(path)
|
|
426
466
|
} catch (e: CancellationException) {
|
|
427
|
-
throw e
|
|
467
|
+
throw e
|
|
428
468
|
} catch (e: Exception) {
|
|
429
469
|
handleBrowserException(e, path, "setting configuration path: $path")
|
|
430
470
|
}
|
|
@@ -438,121 +478,54 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
438
478
|
|
|
439
479
|
override fun getFormattedNavigationError(): FormattedNavigationError? = formattedNavigationError
|
|
440
480
|
|
|
441
|
-
/**
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
private fun httpStatusText(statusCode: Int): String {
|
|
463
|
-
return when (statusCode) {
|
|
464
|
-
400 -> "Bad Request"
|
|
465
|
-
401 -> "Unauthorized"
|
|
466
|
-
403 -> "Forbidden"
|
|
467
|
-
404 -> "Not Found"
|
|
468
|
-
405 -> "Method Not Allowed"
|
|
469
|
-
408 -> "Request Timeout"
|
|
470
|
-
429 -> "Too Many Requests"
|
|
471
|
-
500 -> "Internal Server Error"
|
|
472
|
-
502 -> "Bad Gateway"
|
|
473
|
-
503 -> "Service Unavailable"
|
|
474
|
-
504 -> "Gateway Timeout"
|
|
475
|
-
else -> "Server Error"
|
|
481
|
+
/**
|
|
482
|
+
* The display form of [error] at [path]: the app's `formatNavigationError` when configured, else
|
|
483
|
+
* the built-in default. Shared with the Android Auto empty tile so in-app and in-car copy cannot
|
|
484
|
+
* drift (ADR 0001).
|
|
485
|
+
*/
|
|
486
|
+
internal suspend fun resolveFormattedError(
|
|
487
|
+
error: NavigationError,
|
|
488
|
+
path: String,
|
|
489
|
+
): FormattedNavigationError {
|
|
490
|
+
val default = defaultFormattedError(error)
|
|
491
|
+
val formatter = _configuration.formatNavigationError ?: return default
|
|
492
|
+
return formattedOrDefault(default) {
|
|
493
|
+
formatter(
|
|
494
|
+
FormatNavigationErrorParams(
|
|
495
|
+
error,
|
|
496
|
+
default,
|
|
497
|
+
path,
|
|
498
|
+
BrowserPathHelper.navigationErrorKind(path),
|
|
499
|
+
)
|
|
500
|
+
)
|
|
501
|
+
.awaitOrTimeout()
|
|
476
502
|
}
|
|
477
503
|
}
|
|
478
504
|
|
|
479
|
-
private fun setNavigationError(
|
|
480
|
-
code: NavigationErrorType,
|
|
481
|
-
message: String,
|
|
482
|
-
path: String,
|
|
483
|
-
statusCode: Double? = null,
|
|
484
|
-
statusCodeSuccess: Boolean? = null,
|
|
485
|
-
) {
|
|
486
|
-
val navError = NavigationError(code, message, statusCode, statusCodeSuccess)
|
|
505
|
+
private fun setNavigationError(navError: NavigationError, path: String) {
|
|
487
506
|
navigationError = navError
|
|
488
507
|
onNavigationError(NavigationErrorEvent(navigationError))
|
|
489
508
|
|
|
490
|
-
//
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
}
|
|
504
|
-
} else {
|
|
505
|
-
formattedNavigationError = defaultFormatted
|
|
506
|
-
onFormattedNavigationError(formattedNavigationError)
|
|
509
|
+
// Without a formatter the field and event land in this turn, so a same-turn
|
|
510
|
+
// getFormattedNavigationError or clearNavigationError cannot race a launch yet to run.
|
|
511
|
+
if (_configuration.formatNavigationError == null) {
|
|
512
|
+
val default = defaultFormattedError(navError)
|
|
513
|
+
formattedNavigationError = default
|
|
514
|
+
onFormattedNavigationError(default)
|
|
515
|
+
return
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
mainScope.launch {
|
|
519
|
+
val formatted = resolveFormattedError(navError, path)
|
|
520
|
+
formattedNavigationError = formatted
|
|
521
|
+
onFormattedNavigationError(formatted)
|
|
507
522
|
}
|
|
508
523
|
}
|
|
509
524
|
|
|
510
|
-
/** Maps common browser exceptions to navigation errors */
|
|
511
525
|
private fun handleBrowserException(e: Exception, path: String, logContext: String) {
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
setNavigationError(
|
|
516
|
-
NavigationErrorType.HTTP_ERROR,
|
|
517
|
-
e.message ?: "Server error",
|
|
518
|
-
path,
|
|
519
|
-
e.statusCode.toDouble(),
|
|
520
|
-
e.statusCode in 200..299,
|
|
521
|
-
)
|
|
522
|
-
}
|
|
523
|
-
is NetworkException -> {
|
|
524
|
-
Timber.e(e, "Network error $logContext")
|
|
525
|
-
setNavigationError(
|
|
526
|
-
NavigationErrorType.NETWORK_ERROR,
|
|
527
|
-
e.message ?: "Network request failed",
|
|
528
|
-
path,
|
|
529
|
-
)
|
|
530
|
-
}
|
|
531
|
-
is ContentNotFoundException -> {
|
|
532
|
-
Timber.e(e, "Content not found $logContext")
|
|
533
|
-
setNavigationError(
|
|
534
|
-
NavigationErrorType.CONTENT_NOT_FOUND,
|
|
535
|
-
e.message ?: "Content not found",
|
|
536
|
-
path,
|
|
537
|
-
)
|
|
538
|
-
}
|
|
539
|
-
is CallbackException -> {
|
|
540
|
-
Timber.e(e, "Callback error $logContext")
|
|
541
|
-
setNavigationError(
|
|
542
|
-
NavigationErrorType.CALLBACK_ERROR,
|
|
543
|
-
e.message ?: "An error occurred",
|
|
544
|
-
path,
|
|
545
|
-
)
|
|
546
|
-
}
|
|
547
|
-
else -> {
|
|
548
|
-
Timber.e(e, "Unexpected error $logContext")
|
|
549
|
-
setNavigationError(
|
|
550
|
-
NavigationErrorType.UNKNOWN_ERROR,
|
|
551
|
-
e.message ?: "An unexpected error occurred",
|
|
552
|
-
path,
|
|
553
|
-
)
|
|
554
|
-
}
|
|
555
|
-
}
|
|
526
|
+
val navError = navigationErrorFor(e)
|
|
527
|
+
Timber.e(e, "${navError.code} $logContext")
|
|
528
|
+
setNavigationError(navError, path)
|
|
556
529
|
}
|
|
557
530
|
|
|
558
531
|
private fun clearNavigationError() {
|
|
@@ -571,7 +544,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
571
544
|
override fun navigatePath(path: String) {
|
|
572
545
|
clearNavigationError()
|
|
573
546
|
|
|
574
|
-
// Cancel previous navigation to avoid race conditions
|
|
575
547
|
navigationJob?.cancel()
|
|
576
548
|
|
|
577
549
|
navigationJob =
|
|
@@ -580,7 +552,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
580
552
|
Timber.d("Navigating to path: $path")
|
|
581
553
|
browserManager.navigate(path)
|
|
582
554
|
} catch (e: CancellationException) {
|
|
583
|
-
throw e
|
|
555
|
+
throw e
|
|
584
556
|
} catch (e: Exception) {
|
|
585
557
|
handleBrowserException(e, path, "navigating to path: $path")
|
|
586
558
|
}
|
|
@@ -588,26 +560,31 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
588
560
|
}
|
|
589
561
|
|
|
590
562
|
override fun navigateTrack(track: Track) {
|
|
563
|
+
// A disabled track never plays, whichever surface delivered it (mirrors iOS
|
|
564
|
+
// TrackSelector.select). Refused before any state changes: an inert tap must not clear an
|
|
565
|
+
// unrelated navigation error or cancel an in-flight navigation.
|
|
566
|
+
if (track.disabled == true) {
|
|
567
|
+
Timber.d("Ignoring selection of disabled track: ${track.title}")
|
|
568
|
+
return
|
|
569
|
+
}
|
|
570
|
+
|
|
591
571
|
clearNavigationError()
|
|
592
572
|
|
|
593
|
-
// Cancel previous navigation to avoid race conditions
|
|
594
573
|
navigationJob?.cancel()
|
|
595
574
|
|
|
596
|
-
val
|
|
575
|
+
val path = track.path
|
|
597
576
|
navigationJob =
|
|
598
577
|
mainScope.launch {
|
|
599
578
|
try {
|
|
600
579
|
when {
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
Timber.d("Navigating to contextual track URL: $url")
|
|
580
|
+
path != null && BrowserPathHelper.isContextual(path) -> {
|
|
581
|
+
Timber.d("Navigating to contextual track path: $path")
|
|
604
582
|
|
|
605
|
-
val parentPath = BrowserPathHelper.stripTrackId(
|
|
606
|
-
val trackId = BrowserPathHelper.extractTrackId(
|
|
583
|
+
val parentPath = BrowserPathHelper.stripTrackId(path)
|
|
584
|
+
val trackId = BrowserPathHelper.extractTrackId(path)
|
|
607
585
|
|
|
608
|
-
// Check if queue already came from this parent path - just skip to the track
|
|
609
586
|
if (trackId != null && parentPath == player.queueSourcePath) {
|
|
610
|
-
val index = player.tracks.
|
|
587
|
+
val index = player.tracks.indexOfTappedTrack(path, trackId)
|
|
611
588
|
if (index >= 0) {
|
|
612
589
|
Timber.d("Queue already from $parentPath, skipping to index $index")
|
|
613
590
|
handleTrackLoad(
|
|
@@ -615,6 +592,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
615
592
|
track,
|
|
616
593
|
player.tracks,
|
|
617
594
|
index.toDouble(),
|
|
595
|
+
startPosition = null,
|
|
618
596
|
intercepted = {},
|
|
619
597
|
defaultBehavior = {
|
|
620
598
|
player.skipTo(index)
|
|
@@ -625,8 +603,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
625
603
|
}
|
|
626
604
|
}
|
|
627
605
|
|
|
628
|
-
|
|
629
|
-
val expanded = browserManager.expandQueueFromContextualUrl(url)
|
|
606
|
+
val expanded = browserManager.expandQueueFromContextualPath(path)
|
|
630
607
|
|
|
631
608
|
if (expanded != null) {
|
|
632
609
|
val (tracks, startIndex) = expanded
|
|
@@ -638,34 +615,32 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
638
615
|
track,
|
|
639
616
|
tracks,
|
|
640
617
|
startIndex.toDouble(),
|
|
618
|
+
startPosition = null,
|
|
641
619
|
intercepted = {},
|
|
642
620
|
defaultBehavior = {
|
|
643
|
-
//
|
|
644
|
-
// Use internal player methods directly to avoid blocking on main thread
|
|
621
|
+
// The Player itself: this class's overrides block on main, where this runs.
|
|
645
622
|
player.setQueue(tracks, startIndex, sourcePath = parentPath)
|
|
646
623
|
player.play()
|
|
647
624
|
},
|
|
648
625
|
)
|
|
649
626
|
return@launch
|
|
650
627
|
} else {
|
|
651
|
-
// Fallback: just load the single track
|
|
652
628
|
Timber.w("Queue expansion failed, loading single track")
|
|
653
629
|
handleTrackLoad(
|
|
654
630
|
_configuration.handleTrackLoad,
|
|
655
631
|
track,
|
|
656
632
|
arrayOf(track),
|
|
657
633
|
0.0,
|
|
634
|
+
startPosition = null,
|
|
658
635
|
intercepted = {},
|
|
659
636
|
defaultBehavior = { player.load(track) },
|
|
660
637
|
)
|
|
661
638
|
}
|
|
662
639
|
}
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
browserManager.navigate(url)
|
|
640
|
+
path != null -> {
|
|
641
|
+
Timber.d("Navigating to browsable track: $path")
|
|
642
|
+
browserManager.navigate(path)
|
|
667
643
|
}
|
|
668
|
-
// If track is playable (has src), load it into player
|
|
669
644
|
track.src != null -> {
|
|
670
645
|
Timber.d("Loading playable track into player: ${track.title}")
|
|
671
646
|
handleTrackLoad(
|
|
@@ -673,27 +648,39 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
673
648
|
track,
|
|
674
649
|
arrayOf(track),
|
|
675
650
|
0.0,
|
|
651
|
+
startPosition = null,
|
|
676
652
|
intercepted = {},
|
|
677
653
|
defaultBehavior = { player.load(track) },
|
|
678
654
|
)
|
|
679
655
|
}
|
|
680
656
|
else -> {
|
|
681
|
-
throw IllegalArgumentException("Track must have either
|
|
657
|
+
throw IllegalArgumentException("Track must have either a 'path' or an 'src' property")
|
|
682
658
|
}
|
|
683
659
|
}
|
|
684
660
|
} catch (e: CancellationException) {
|
|
685
|
-
throw e
|
|
661
|
+
throw e
|
|
686
662
|
} catch (e: Exception) {
|
|
687
|
-
handleBrowserException(e,
|
|
663
|
+
handleBrowserException(e, path ?: track.src ?: "", "navigating to track: ${track.title}")
|
|
688
664
|
}
|
|
689
665
|
}
|
|
690
666
|
}
|
|
691
667
|
|
|
692
|
-
override fun
|
|
693
|
-
return
|
|
668
|
+
override fun search(query: String): Promise<Array<Track>> {
|
|
669
|
+
return promise {
|
|
694
670
|
Timber.d("Searching for: $query")
|
|
695
|
-
|
|
696
|
-
|
|
671
|
+
// Rejects with the error a browse would raise but leaves the navigation error unset: a failed
|
|
672
|
+
// search must not replace the displayed page's state (mirrors iOS HybridAudioBrowser.search).
|
|
673
|
+
val searchResults =
|
|
674
|
+
try {
|
|
675
|
+
browserManager.search(query)
|
|
676
|
+
} catch (e: CancellationException) {
|
|
677
|
+
throw e
|
|
678
|
+
} catch (e: Exception) {
|
|
679
|
+
Timber.e(e, "Search failed for query: $query")
|
|
680
|
+
throw NavigationErrorException(navigationErrorFor(e))
|
|
681
|
+
}
|
|
682
|
+
// Not `children`: search builds one untitled section (ADR 0010), so `children` is null.
|
|
683
|
+
searchResults.flattenedChildren?.toTypedArray() ?: emptyArray()
|
|
697
684
|
}
|
|
698
685
|
}
|
|
699
686
|
|
|
@@ -704,13 +691,11 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
704
691
|
override fun notifyContentChanged(path: String) {
|
|
705
692
|
Timber.d("Notifying content changed for path: $path")
|
|
706
693
|
|
|
707
|
-
// Invalidate cached content so future navigations fetch fresh data
|
|
708
694
|
browserManager.invalidateContentCache(path)
|
|
709
695
|
|
|
710
|
-
//
|
|
711
|
-
connectedService?.player?.notifyContentChanged(path)
|
|
696
|
+
// MediaSession asserts the main thread; this override runs on the JS thread.
|
|
697
|
+
launchInScope { connectedService?.player?.notifyContentChanged(path) }
|
|
712
698
|
|
|
713
|
-
// If we're currently viewing this path, refresh the content
|
|
714
699
|
if (browserManager.getPath() == path) {
|
|
715
700
|
mainScope.launch { browserManager.refresh() }
|
|
716
701
|
}
|
|
@@ -719,13 +704,15 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
719
704
|
override fun invalidateAllContent() {
|
|
720
705
|
Timber.d("Invalidating all content")
|
|
721
706
|
|
|
722
|
-
// Clear all cached content so every path re-fetches fresh data
|
|
723
707
|
browserManager.clearContentCache()
|
|
724
708
|
|
|
725
|
-
//
|
|
726
|
-
connectedService?.player?.invalidateAllContent()
|
|
709
|
+
// MediaSession asserts the main thread; this override runs on the JS thread.
|
|
710
|
+
launchInScope { connectedService?.player?.invalidateAllContent() }
|
|
727
711
|
|
|
728
|
-
|
|
712
|
+
mainScope.launch {
|
|
713
|
+
runCatching { browserManager.queryTabs() }
|
|
714
|
+
.onFailure { Timber.e(it, "Re-querying tabs failed") }
|
|
715
|
+
}
|
|
729
716
|
mainScope.launch { browserManager.refresh() }
|
|
730
717
|
}
|
|
731
718
|
|
|
@@ -735,72 +722,48 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
735
722
|
|
|
736
723
|
// MARK: Gate
|
|
737
724
|
|
|
738
|
-
/**
|
|
725
|
+
/** [chrome] is non-null whenever [gated] is true: the serve sites force-unwrap it. */
|
|
739
726
|
data class GateOutcome(val gated: Boolean, val chrome: Gate?)
|
|
740
727
|
|
|
741
|
-
// The minimal chrome rendered when a gate is active but no override or stored
|
|
742
|
-
// default chrome exists (the resolver-only setGate overload).
|
|
743
728
|
private val builtInGate = Gate("Unavailable", null)
|
|
744
729
|
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
* MediaSessionCallback consult it) — hence the single field is @Volatile.
|
|
749
|
-
*
|
|
750
|
-
* Folding the three former @Volatile fields into one reference is what makes the read atomic:
|
|
751
|
-
*
|
|
752
|
-
* @Volatile gives per-field visibility but NO atomicity across a compound read, so reading three
|
|
753
|
-
* separate volatiles in [gateDecision] could interleave with a concurrent [clearGate] and yield
|
|
754
|
-
* a torn `(active=true, chrome=null)` state that crashed the force-unwrap at the serve sites.
|
|
755
|
-
* One volatile reference read once cannot tear.
|
|
756
|
-
*/
|
|
730
|
+
// One volatile reference, so [gateDecision] reads all three fields at once: separate volatiles
|
|
731
|
+
// could tear against [clearGate] into an active gate with no chrome. Written on the JS thread,
|
|
732
|
+
// read on the Media3 application thread.
|
|
757
733
|
private data class GateState(val active: Boolean, val chrome: Gate?, val hasResolver: Boolean)
|
|
758
734
|
|
|
759
735
|
@Volatile private var gateState = GateState(active = false, chrome = null, hasResolver = false)
|
|
760
736
|
|
|
761
737
|
override fun setGate(gate: Gate?, hasResolver: Boolean) {
|
|
762
|
-
// Single atomic assignment — readers never see a half-updated triple.
|
|
763
738
|
gateState = GateState(active = true, chrome = gate, hasResolver = hasResolver)
|
|
764
|
-
// Re-
|
|
765
|
-
//
|
|
766
|
-
//
|
|
767
|
-
connectedService?.player?.invalidateAllContent()
|
|
739
|
+
// Re-queries every subscribed parent so a connected controller swaps its lists for the gate
|
|
740
|
+
// tile without reconnecting; the content cache stays warm for when the gate clears.
|
|
741
|
+
// MediaSession asserts the main thread; this override runs on the JS thread.
|
|
742
|
+
launchInScope { connectedService?.player?.invalidateAllContent() }
|
|
768
743
|
}
|
|
769
744
|
|
|
770
745
|
override fun clearGate() {
|
|
771
746
|
if (!gateState.active) return
|
|
772
|
-
// Single atomic assignment — readers never see a half-cleared triple.
|
|
773
747
|
gateState = GateState(active = false, chrome = null, hasResolver = false)
|
|
774
|
-
|
|
748
|
+
// MediaSession asserts the main thread; this override runs on the JS thread.
|
|
749
|
+
launchInScope { connectedService?.player?.invalidateAllContent() }
|
|
775
750
|
}
|
|
776
751
|
|
|
777
752
|
/**
|
|
778
|
-
*
|
|
779
|
-
*
|
|
780
|
-
*
|
|
781
|
-
*
|
|
782
|
-
*
|
|
783
|
-
* - No active gate → allow.
|
|
784
|
-
* - Active gate, no resolver → static fast path: gate with the stored default chrome (or built-in
|
|
785
|
-
* if none), no JS hop.
|
|
786
|
-
* - Active gate with a resolver → ask JS per request. A resolver that throws / rejects / times
|
|
787
|
-
* out FAILS CLOSED by design: while a gate is active the consumer has declared content blocked,
|
|
788
|
-
* so the only safe fallback when we cannot compute the per-request decision is the gate's own
|
|
789
|
-
* chrome — never the content. A *successful* `gated:false` still allows. Chrome order on a
|
|
790
|
-
* gated decision: override → stored default → built-in.
|
|
791
|
-
*
|
|
792
|
-
* Every gated return guards chrome against null (`?: builtInGate`) so a gated outcome always
|
|
793
|
-
* carries a renderable chrome — the serve sites force-unwrap it.
|
|
753
|
+
* Whether [request] is gated, and with which chrome. No active gate allows; a gate without a
|
|
754
|
+
* resolver gates with its stored chrome and never asks JS. A resolver that throws, rejects or
|
|
755
|
+
* times out fails closed, gating rather than serving content; only a successful `gated: false`
|
|
756
|
+
* allows. Chrome falls back from the resolver's to the stored one to [builtInGate]. A caller
|
|
757
|
+
* cancelled while it waits gets the cancellation.
|
|
794
758
|
*/
|
|
795
759
|
suspend fun gateDecision(request: NativeGateRequest): GateOutcome {
|
|
796
|
-
// Read the whole gate triple once; a single volatile reference can't tear (see [GateState]).
|
|
797
760
|
val s = gateState
|
|
798
761
|
if (!s.active) return GateOutcome(false, null)
|
|
799
|
-
if (!s.hasResolver) return GateOutcome(true, s.chrome ?: builtInGate)
|
|
800
|
-
val
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
if (!decision.gated) return GateOutcome(false, null)
|
|
762
|
+
if (!s.hasResolver) return GateOutcome(true, s.chrome ?: builtInGate)
|
|
763
|
+
val result = runCatching { resolveGate(request).awaitNestedOrTimeout() }
|
|
764
|
+
currentCoroutineContext().ensureActive()
|
|
765
|
+
val decision = result.getOrNull() ?: return GateOutcome(true, s.chrome ?: builtInGate)
|
|
766
|
+
if (!decision.gated) return GateOutcome(false, null)
|
|
804
767
|
return GateOutcome(true, decision.gate ?: s.chrome ?: builtInGate)
|
|
805
768
|
}
|
|
806
769
|
|
|
@@ -811,9 +774,8 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
811
774
|
override var onCarConnectedChanged: (Boolean) -> Unit = {}
|
|
812
775
|
set(value) {
|
|
813
776
|
field = value
|
|
814
|
-
carConnectionTarget
|
|
815
|
-
//
|
|
816
|
-
// this JS runtime subscribed) — mirrors the iOS behavior.
|
|
777
|
+
carConnectionTarget.set(value)
|
|
778
|
+
// The car may have connected before this runtime subscribed (mirrors iOS).
|
|
817
779
|
value(carConnected)
|
|
818
780
|
}
|
|
819
781
|
|
|
@@ -822,11 +784,10 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
822
784
|
// ============================================================================
|
|
823
785
|
|
|
824
786
|
override fun setupPlayer(options: NativeSetupPlayerOptions): Promise<Unit> {
|
|
825
|
-
return
|
|
787
|
+
return promise {
|
|
826
788
|
setupOptions.update(options)
|
|
827
|
-
//
|
|
828
|
-
//
|
|
829
|
-
// service connect). Last-write-wins with their imperative counterparts.
|
|
789
|
+
// Staged to apply together with the engine below, or at service connect. Last write wins
|
|
790
|
+
// against the imperative setters.
|
|
830
791
|
options.options?.let { updateOptions.updateFromBridge(it) }
|
|
831
792
|
options.repeatMode?.let { pendingRepeatMode = it }
|
|
832
793
|
options.playWhenReady?.let { pendingPlayWhenReady = it }
|
|
@@ -835,35 +796,26 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
835
796
|
it.player.applyOptions(updateOptions)
|
|
836
797
|
it.player.setup(setupOptions)
|
|
837
798
|
applyPendingPlayerState(it.player)
|
|
838
|
-
return@
|
|
799
|
+
return@promise
|
|
839
800
|
}
|
|
840
801
|
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
Timber.d("Binding to AudioBrowserService")
|
|
844
|
-
val bound = serviceBinding.bind(Intent(context, Service::class.java), this@AudioBrowser)
|
|
845
|
-
|
|
846
|
-
if (!bound) {
|
|
847
|
-
continuation.resumeWithException(
|
|
848
|
-
RuntimeException("Failed to bind to AudioBrowserService")
|
|
849
|
-
)
|
|
850
|
-
} else {
|
|
851
|
-
// Service will resolve the promise in onServiceConnected
|
|
852
|
-
setupPromise = { continuation.resume(Unit) }
|
|
853
|
-
}
|
|
802
|
+
if (!serviceBinding.bind(Intent(context, Service::class.java), this@AudioBrowser)) {
|
|
803
|
+
throw RuntimeException("Failed to bind to AudioBrowserService")
|
|
854
804
|
}
|
|
805
|
+
connectionReady.await()
|
|
855
806
|
}
|
|
856
807
|
}
|
|
857
808
|
|
|
858
809
|
override fun updateOptions(options: NativeUpdateOptions) {
|
|
859
810
|
updateOptions.updateFromBridge(options)
|
|
860
|
-
//
|
|
861
|
-
|
|
811
|
+
// Blocks rather than launches: updateFromBridge mutates the holder in place on the JS thread
|
|
812
|
+
// and applyOptions reads it on main (Media3 asserts main), so blocking keeps the two ordered.
|
|
813
|
+
connectedService?.let { service ->
|
|
814
|
+
runBlockingOnMain { service.player.applyOptions(updateOptions) }
|
|
815
|
+
}
|
|
862
816
|
}
|
|
863
817
|
|
|
864
818
|
override fun getOptions(): Options {
|
|
865
|
-
// The holder is the source of truth whether or not the player exists yet — updateOptions
|
|
866
|
-
// merges into it and setup/connect applies it to the player.
|
|
867
819
|
return updateOptions.toNitro()
|
|
868
820
|
}
|
|
869
821
|
|
|
@@ -872,28 +824,28 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
872
824
|
// ============================================================================
|
|
873
825
|
|
|
874
826
|
override fun load(track: Track) {
|
|
875
|
-
|
|
827
|
+
// Throws without a player, as on iOS: a track asked for and silently dropped hides a mistake.
|
|
828
|
+
// Blocks rather than launching, so a track the player refuses fails this call.
|
|
829
|
+
runBlockingOnMain { player.load(track) }
|
|
876
830
|
}
|
|
877
831
|
|
|
878
|
-
override fun reset() =
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
}
|
|
832
|
+
override fun reset() =
|
|
833
|
+
commandPlayer("reset") { player ->
|
|
834
|
+
player.stop()
|
|
835
|
+
player.clear()
|
|
836
|
+
// clear() while idle emits no engine event, so the state would otherwise stay STOPPED.
|
|
837
|
+
player.setPlaybackState(PlaybackState.NONE)
|
|
838
|
+
}
|
|
886
839
|
|
|
887
|
-
override fun play() =
|
|
840
|
+
override fun play() = commandPlayer("play") { it.play() }
|
|
888
841
|
|
|
889
|
-
override fun pause() =
|
|
842
|
+
override fun pause() = commandPlayer("pause") { it.pause() }
|
|
890
843
|
|
|
891
|
-
override fun togglePlayback() =
|
|
844
|
+
override fun togglePlayback() = commandPlayer("togglePlayback") { it.togglePlayback() }
|
|
892
845
|
|
|
893
|
-
override fun stop() =
|
|
846
|
+
override fun stop() = commandPlayer("stop") { it.stop() }
|
|
894
847
|
|
|
895
848
|
override fun setPlayWhenReady(playWhenReady: Boolean) = runBlockingOnMain {
|
|
896
|
-
// Pre-setup this stages the intent for the player to come up with — never throws.
|
|
897
849
|
connectedService?.player?.let { it.playWhenReady = playWhenReady }
|
|
898
850
|
?: run { pendingPlayWhenReady = playWhenReady }
|
|
899
851
|
}
|
|
@@ -902,157 +854,168 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
902
854
|
connectedService?.player?.playWhenReady ?: pendingPlayWhenReady ?: false
|
|
903
855
|
}
|
|
904
856
|
|
|
905
|
-
override fun seekTo(position: Double) =
|
|
906
|
-
|
|
907
|
-
|
|
857
|
+
override fun seekTo(position: Double) =
|
|
858
|
+
commandPlayer("seekTo") { player ->
|
|
859
|
+
player.seekTo((position * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
860
|
+
}
|
|
908
861
|
|
|
909
|
-
override fun seekBy(offset: Double) =
|
|
910
|
-
|
|
911
|
-
|
|
862
|
+
override fun seekBy(offset: Double) =
|
|
863
|
+
commandPlayer("seekBy") { player ->
|
|
864
|
+
player.seekBy((offset * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
865
|
+
}
|
|
912
866
|
|
|
913
|
-
override fun seekToLiveEdge() =
|
|
867
|
+
override fun seekToLiveEdge() = commandPlayer("seekToLiveEdge") { it.seekToLiveEdge() }
|
|
914
868
|
|
|
915
|
-
override fun setVolume(level: Double) =
|
|
869
|
+
override fun setVolume(level: Double) = commandPlayer("setVolume") { it.volume = level.toFloat() }
|
|
916
870
|
|
|
917
|
-
override fun getVolume(): Double =
|
|
871
|
+
override fun getVolume(): Double = readPlayer(1.0) { it.volume.toDouble() }
|
|
918
872
|
|
|
919
|
-
override fun setRate(rate: Double) =
|
|
873
|
+
override fun setRate(rate: Double) =
|
|
874
|
+
commandPlayer("setRate") { it.playbackSpeed = rate.toFloat() }
|
|
920
875
|
|
|
921
|
-
override fun getRate(): Double =
|
|
876
|
+
override fun getRate(): Double = readPlayer(1.0) { it.playbackSpeed.toDouble() }
|
|
922
877
|
|
|
923
|
-
override fun getProgress(): Progress =
|
|
924
|
-
Progress(
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
878
|
+
override fun getProgress(): Progress =
|
|
879
|
+
readPlayer(Progress(duration = 0.0, position = 0.0, buffered = 0.0)) { player ->
|
|
880
|
+
Progress(
|
|
881
|
+
duration = player.duration.toSeconds(),
|
|
882
|
+
position = player.position.toSeconds(),
|
|
883
|
+
buffered = player.bufferedPosition.toSeconds(),
|
|
884
|
+
)
|
|
885
|
+
}
|
|
930
886
|
|
|
931
|
-
override fun getPlayback(): Playback =
|
|
887
|
+
override fun getPlayback(): Playback =
|
|
888
|
+
readPlayer(Playback(PlaybackState.NONE, null)) { it.getPlayback() }
|
|
932
889
|
|
|
933
|
-
override fun getPlayingState(): PlayingState =
|
|
890
|
+
override fun getPlayingState(): PlayingState =
|
|
891
|
+
readPlayer(PlayingState(playing = false, buffering = false)) { it.getPlayingState() }
|
|
934
892
|
|
|
935
893
|
override fun getRepeatMode(): RepeatMode = runBlockingOnMain {
|
|
936
894
|
connectedService?.player?.repeatMode ?: pendingRepeatMode ?: RepeatMode.OFF
|
|
937
895
|
}
|
|
938
896
|
|
|
939
897
|
override fun setRepeatMode(mode: RepeatMode) = runBlockingOnMain {
|
|
940
|
-
// Pre-setup this stages the mode for the player to come up with — never throws.
|
|
941
898
|
connectedService?.player?.let { it.repeatMode = mode } ?: run { pendingRepeatMode = mode }
|
|
942
899
|
}
|
|
943
900
|
|
|
944
|
-
override fun getShuffleEnabled(): Boolean =
|
|
901
|
+
override fun getShuffleEnabled(): Boolean = readPlayer(false) { it.shuffleMode }
|
|
945
902
|
|
|
946
|
-
override fun setShuffleEnabled(enabled: Boolean) =
|
|
947
|
-
player.shuffleMode = enabled
|
|
948
|
-
}
|
|
903
|
+
override fun setShuffleEnabled(enabled: Boolean) =
|
|
904
|
+
commandPlayer("setShuffleEnabled") { player -> player.shuffleMode = enabled }
|
|
949
905
|
|
|
950
|
-
override fun setPlaybackIntervalEnabled(enabled: Boolean) =
|
|
951
|
-
|
|
952
|
-
|
|
906
|
+
override fun setPlaybackIntervalEnabled(enabled: Boolean) =
|
|
907
|
+
commandPlayer("setPlaybackIntervalEnabled") { player ->
|
|
908
|
+
player.setPlaybackIntervalEnabled(enabled)
|
|
909
|
+
}
|
|
953
910
|
|
|
954
|
-
override fun getPlaybackError(): PlaybackError? =
|
|
911
|
+
override fun getPlaybackError(): PlaybackError? = readPlayer(null) { it.playbackError }
|
|
955
912
|
|
|
956
|
-
override fun retry() =
|
|
913
|
+
override fun retry() = commandPlayer("retry") { it.prepare() }
|
|
957
914
|
|
|
958
915
|
// ============================================================================
|
|
959
916
|
// MARK: Queue Management
|
|
960
917
|
// ============================================================================
|
|
961
918
|
|
|
962
|
-
override fun add(tracks: Array<Track>, insertBeforeIndex: Double?) =
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
919
|
+
override fun add(tracks: Array<Track>, insertBeforeIndex: Double?) =
|
|
920
|
+
commandPlayer("add") { player ->
|
|
921
|
+
val inputIndex = insertBeforeIndex?.toInt() ?: -1
|
|
922
|
+
player.add(tracks, inputIndex)
|
|
923
|
+
}
|
|
966
924
|
|
|
967
|
-
override fun move(fromIndex: Double, toIndex: Double) =
|
|
968
|
-
player.move(fromIndex.toInt(), toIndex.toInt())
|
|
969
|
-
}
|
|
925
|
+
override fun move(fromIndex: Double, toIndex: Double) =
|
|
926
|
+
commandPlayer("move") { player -> player.move(fromIndex.toInt(), toIndex.toInt()) }
|
|
970
927
|
|
|
971
|
-
override fun remove(indexes: DoubleArray) =
|
|
972
|
-
|
|
973
|
-
|
|
974
|
-
|
|
928
|
+
override fun remove(indexes: DoubleArray) =
|
|
929
|
+
commandPlayer("remove") { player ->
|
|
930
|
+
val indexList = indexes.map { it.toInt() }
|
|
931
|
+
player.remove(indexList)
|
|
932
|
+
}
|
|
975
933
|
|
|
976
|
-
override fun removeUpcomingTracks() =
|
|
934
|
+
override fun removeUpcomingTracks() =
|
|
935
|
+
commandPlayer("removeUpcomingTracks") { it.removeUpcomingTracks() }
|
|
977
936
|
|
|
978
|
-
override fun skip(index: Double, initialPosition: Double?) =
|
|
979
|
-
|
|
937
|
+
override fun skip(index: Double, initialPosition: Double?) =
|
|
938
|
+
commandPlayer("skip") { player ->
|
|
939
|
+
player.skipTo(index.toInt())
|
|
980
940
|
|
|
981
|
-
|
|
982
|
-
|
|
941
|
+
if (initialPosition != null && initialPosition >= 0) {
|
|
942
|
+
player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
943
|
+
}
|
|
983
944
|
}
|
|
984
|
-
}
|
|
985
945
|
|
|
986
|
-
override fun skipToNext(initialPosition: Double?) =
|
|
987
|
-
|
|
946
|
+
override fun skipToNext(initialPosition: Double?) =
|
|
947
|
+
commandPlayer("skipToNext") { player ->
|
|
948
|
+
player.next()
|
|
988
949
|
|
|
989
|
-
|
|
990
|
-
|
|
950
|
+
if (initialPosition != null && initialPosition >= 0) {
|
|
951
|
+
player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
952
|
+
}
|
|
991
953
|
}
|
|
992
|
-
}
|
|
993
954
|
|
|
994
|
-
override fun skipToPrevious(initialPosition: Double?) =
|
|
995
|
-
|
|
955
|
+
override fun skipToPrevious(initialPosition: Double?) =
|
|
956
|
+
commandPlayer("skipToPrevious") { player ->
|
|
957
|
+
player.previous()
|
|
996
958
|
|
|
997
|
-
|
|
998
|
-
|
|
959
|
+
if (initialPosition != null && initialPosition >= 0) {
|
|
960
|
+
player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
961
|
+
}
|
|
999
962
|
}
|
|
1000
|
-
}
|
|
1001
963
|
|
|
1002
964
|
override fun setQueue(tracks: Array<Track>, startIndex: Double?, startPosition: Double?) =
|
|
1003
|
-
|
|
965
|
+
commandPlayer("setQueue") { player ->
|
|
1004
966
|
player.setQueue(tracks, startIndex?.toInt() ?: 0, ((startPosition ?: 0.0) * 1000).toLong())
|
|
1005
967
|
}
|
|
1006
968
|
|
|
1007
|
-
override fun setActiveTrackFavorited(favorited: Boolean) =
|
|
1008
|
-
|
|
1009
|
-
|
|
969
|
+
override fun setActiveTrackFavorited(favorited: Boolean): Unit =
|
|
970
|
+
commandPlayer("setActiveTrackFavorited") { player ->
|
|
971
|
+
// The applied result serves MediaSession; the JS API is fire-and-forget.
|
|
972
|
+
player.setActiveTrackFavorited(favorited)
|
|
973
|
+
}
|
|
1010
974
|
|
|
1011
|
-
override fun toggleActiveTrackFavorited() =
|
|
1012
|
-
|
|
1013
|
-
}
|
|
975
|
+
override fun toggleActiveTrackFavorited(): Unit =
|
|
976
|
+
commandPlayer("toggleActiveTrackFavorited") { it.toggleActiveTrackFavorited() }
|
|
1014
977
|
|
|
1015
|
-
override fun getQueue(): Array<Track> =
|
|
978
|
+
override fun getQueue(): Array<Track> = readPlayer(emptyArray()) { it.tracks }
|
|
1016
979
|
|
|
1017
|
-
override fun getTrack(index: Double): Track? =
|
|
1018
|
-
|
|
1019
|
-
|
|
1020
|
-
|
|
1021
|
-
|
|
980
|
+
override fun getTrack(index: Double): Track? =
|
|
981
|
+
readPlayer(null) { player ->
|
|
982
|
+
try {
|
|
983
|
+
player.getTrack(index.toInt())
|
|
984
|
+
} catch (e: IllegalArgumentException) {
|
|
985
|
+
null
|
|
986
|
+
}
|
|
1022
987
|
}
|
|
1023
|
-
}
|
|
1024
988
|
|
|
1025
|
-
override fun getActiveTrackIndex(): Double? =
|
|
1026
|
-
player.currentIndex?.toDouble()
|
|
1027
|
-
}
|
|
989
|
+
override fun getActiveTrackIndex(): Double? = readPlayer(null) { it.currentIndex?.toDouble() }
|
|
1028
990
|
|
|
1029
|
-
override fun getActiveTrack(): Track? =
|
|
991
|
+
override fun getActiveTrack(): Track? = readPlayer(null) { it.currentTrack }
|
|
1030
992
|
|
|
1031
993
|
// ============================================================================
|
|
1032
994
|
// MARK: Now Playing Metadata
|
|
1033
995
|
// ============================================================================
|
|
1034
996
|
|
|
1035
|
-
override fun updateNowPlaying(update: NowPlayingUpdate?) =
|
|
1036
|
-
player.nowPlaying.updateNowPlaying(update)
|
|
1037
|
-
}
|
|
997
|
+
override fun updateNowPlaying(update: NowPlayingUpdate?) =
|
|
998
|
+
commandPlayer("updateNowPlaying") { player -> player.nowPlaying.updateNowPlaying(update) }
|
|
1038
999
|
|
|
1039
|
-
override fun flashNowPlaying(update: NowPlayingUpdate, durationMs: Double) =
|
|
1040
|
-
|
|
1041
|
-
|
|
1000
|
+
override fun flashNowPlaying(update: NowPlayingUpdate, durationMs: Double) =
|
|
1001
|
+
commandPlayer("flashNowPlaying") { player ->
|
|
1002
|
+
player.nowPlaying.flashNowPlaying(update, durationMs)
|
|
1003
|
+
}
|
|
1042
1004
|
|
|
1043
|
-
override fun clearNowPlayingFlash() =
|
|
1044
|
-
player.nowPlaying.clearNowPlayingFlash()
|
|
1045
|
-
}
|
|
1005
|
+
override fun clearNowPlayingFlash() =
|
|
1006
|
+
commandPlayer("clearNowPlayingFlash") { player -> player.nowPlaying.clearNowPlayingFlash() }
|
|
1046
1007
|
|
|
1047
|
-
override fun getNowPlaying(): NowPlayingMetadata? =
|
|
1048
|
-
player.nowPlaying.getNowPlaying()
|
|
1049
|
-
|
|
1008
|
+
override fun getNowPlaying(): NowPlayingMetadata? =
|
|
1009
|
+
readPlayer(null) { player -> player.nowPlaying.getNowPlaying() }
|
|
1010
|
+
|
|
1011
|
+
override fun getTimedMetadata(): TimedMetadata? =
|
|
1012
|
+
readPlayer(null) { player -> player.nowPlaying.timedMetadata }
|
|
1050
1013
|
|
|
1051
1014
|
// ============================================================================
|
|
1052
1015
|
// MARK: Network Connectivity
|
|
1053
1016
|
// ============================================================================
|
|
1054
1017
|
|
|
1055
|
-
override fun getOnline(): Boolean =
|
|
1018
|
+
override fun getOnline(): Boolean = readPlayer(true) { it.getOnline() }
|
|
1056
1019
|
|
|
1057
1020
|
// ============================================================================
|
|
1058
1021
|
// MARK: System Volume
|
|
@@ -1078,48 +1041,43 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1078
1041
|
// MARK: Equalizer (Android only)
|
|
1079
1042
|
// ============================================================================
|
|
1080
1043
|
|
|
1081
|
-
override fun getEqualizerSettings(): EqualizerSettings? =
|
|
1082
|
-
player.equalizer.getSettings()
|
|
1083
|
-
}
|
|
1044
|
+
override fun getEqualizerSettings(): EqualizerSettings? =
|
|
1045
|
+
readPlayer(null) { player -> player.equalizer.getSettings() }
|
|
1084
1046
|
|
|
1085
|
-
override fun setEqualizerEnabled(enabled: Boolean) =
|
|
1086
|
-
player.equalizer.setEnabled(enabled)
|
|
1087
|
-
}
|
|
1047
|
+
override fun setEqualizerEnabled(enabled: Boolean) =
|
|
1048
|
+
commandPlayer("setEqualizerEnabled") { player -> player.equalizer.setEnabled(enabled) }
|
|
1088
1049
|
|
|
1089
|
-
override fun setEqualizerPreset(preset: String) =
|
|
1090
|
-
player.equalizer.setPreset(preset)
|
|
1091
|
-
}
|
|
1050
|
+
override fun setEqualizerPreset(preset: String) =
|
|
1051
|
+
commandPlayer("setEqualizerPreset") { player -> player.equalizer.setPreset(preset) }
|
|
1092
1052
|
|
|
1093
|
-
override fun setEqualizerLevels(levels: DoubleArray) =
|
|
1094
|
-
player.equalizer.setLevels(levels)
|
|
1095
|
-
}
|
|
1053
|
+
override fun setEqualizerLevels(levels: DoubleArray) =
|
|
1054
|
+
commandPlayer("setEqualizerLevels") { player -> player.equalizer.setLevels(levels) }
|
|
1096
1055
|
|
|
1097
1056
|
// ============================================================================
|
|
1098
1057
|
// MARK: Sleep Timer
|
|
1099
1058
|
// ============================================================================
|
|
1100
1059
|
|
|
1101
|
-
override fun getSleepTimer(): SleepTimer =
|
|
1060
|
+
override fun getSleepTimer(): SleepTimer =
|
|
1061
|
+
readPlayer(SleepTimer.create(NullType.NULL)) { it.sleepTimer.get() }
|
|
1102
1062
|
|
|
1103
|
-
override fun setSleepTimer(seconds: Double, fadeDuration: Double?) =
|
|
1104
|
-
player.sleepTimer.setAfter(seconds, fadeDuration)
|
|
1105
|
-
}
|
|
1063
|
+
override fun setSleepTimer(seconds: Double, fadeDuration: Double?) =
|
|
1064
|
+
commandPlayer("setSleepTimer") { player -> player.sleepTimer.setAfter(seconds, fadeDuration) }
|
|
1106
1065
|
|
|
1107
|
-
override fun setSleepTimerToEndOfTrack() =
|
|
1066
|
+
override fun setSleepTimerToEndOfTrack() =
|
|
1067
|
+
commandPlayer("setSleepTimerToEndOfTrack") { it.sleepTimer.setEndOfTrack() }
|
|
1108
1068
|
|
|
1109
|
-
override fun clearSleepTimer(): Boolean =
|
|
1069
|
+
override fun clearSleepTimer(): Boolean = readPlayer(false) { it.sleepTimer.clear() }
|
|
1110
1070
|
|
|
1111
1071
|
// ============================================================================
|
|
1112
1072
|
// MARK: Battery Optimization (Android only)
|
|
1113
1073
|
// ============================================================================
|
|
1114
1074
|
|
|
1115
|
-
/** Track last known status for change detection */
|
|
1116
1075
|
private var lastKnownBatteryStatus: BatteryOptimizationHelper.Status? = null
|
|
1117
1076
|
|
|
1118
1077
|
override fun getBatteryWarningPending(): Boolean {
|
|
1119
1078
|
val rawPending = BatteryWarningStore.isWarningPending(context)
|
|
1120
1079
|
val status = BatteryOptimizationHelper.getStatus(context)
|
|
1121
1080
|
|
|
1122
|
-
// Auto-clear if status is now unrestricted
|
|
1123
1081
|
return if (rawPending && status == BatteryOptimizationHelper.Status.UNRESTRICTED) {
|
|
1124
1082
|
BatteryWarningStore.clearWarning(context)
|
|
1125
1083
|
post { onBatteryWarningPendingChanged(BatteryWarningPendingChangedEvent(false)) }
|
|
@@ -1142,10 +1100,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1142
1100
|
BatteryOptimizationHelper.openSettings(context)
|
|
1143
1101
|
}
|
|
1144
1102
|
|
|
1145
|
-
/**
|
|
1146
|
-
* Check if battery status changed since last check and fire events if so. Called automatically
|
|
1147
|
-
* when app comes to foreground via ProcessLifecycleOwner.
|
|
1148
|
-
*/
|
|
1149
1103
|
private fun checkBatteryStatusChange() {
|
|
1150
1104
|
val currentStatus = BatteryOptimizationHelper.getStatus(context)
|
|
1151
1105
|
if (lastKnownBatteryStatus != null && lastKnownBatteryStatus != currentStatus) {
|
|
@@ -1155,7 +1109,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1155
1109
|
)
|
|
1156
1110
|
}
|
|
1157
1111
|
|
|
1158
|
-
// Auto-clear warning if now unrestricted
|
|
1159
1112
|
if (
|
|
1160
1113
|
currentStatus == BatteryOptimizationHelper.Status.UNRESTRICTED &&
|
|
1161
1114
|
BatteryWarningStore.isWarningPending(context)
|
|
@@ -1187,46 +1140,30 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1187
1140
|
player.applyOptions(updateOptions)
|
|
1188
1141
|
player.setup(setupOptions)
|
|
1189
1142
|
applyPendingPlayerState(player)
|
|
1190
|
-
// Start observing network connectivity changes
|
|
1191
1143
|
player.observeNetworkConnectivity(mainScope)
|
|
1192
|
-
// Set browser reference for media URL transformation
|
|
1193
1144
|
player.browser = this@AudioBrowser
|
|
1194
1145
|
|
|
1195
|
-
//
|
|
1196
|
-
|
|
1197
|
-
if (_configuration.routes?.isNotEmpty() == true) {
|
|
1198
|
-
player.notifyBrowserConfigurationReady()
|
|
1199
|
-
}
|
|
1146
|
+
// The configuration setter's notify finds no service when it runs before connect.
|
|
1147
|
+
if (isConfigured) player.notifyBrowserConfigurationReady()
|
|
1200
1148
|
}
|
|
1201
1149
|
|
|
1202
|
-
|
|
1203
|
-
connectedService?.onBatteryWarningPendingChanged = { pending ->
|
|
1204
|
-
post {
|
|
1205
|
-
this@AudioBrowser.onBatteryWarningPendingChanged(
|
|
1206
|
-
BatteryWarningPendingChangedEvent(pending)
|
|
1207
|
-
)
|
|
1208
|
-
}
|
|
1209
|
-
}
|
|
1150
|
+
connectedService?.onBatteryWarningPendingChanged = onBatteryWarningPending
|
|
1210
1151
|
|
|
1211
1152
|
val sessionToken = SessionToken(context, ComponentName(context, Service::class.java))
|
|
1212
1153
|
mediaBrowserFuture = MediaBrowser.Builder(context, sessionToken).buildAsync()
|
|
1213
1154
|
|
|
1214
|
-
|
|
1215
|
-
setupPromise = null
|
|
1155
|
+
connectionReady.complete(Unit)
|
|
1216
1156
|
}
|
|
1217
1157
|
}
|
|
1218
1158
|
|
|
1219
|
-
|
|
1220
|
-
* Applies initial player state staged before the player existed. Consumed on apply so a later
|
|
1221
|
-
* re-setup doesn't replay stale state.
|
|
1222
|
-
*/
|
|
1159
|
+
// Consumes what it applies, so a later re-setup does not replay stale state.
|
|
1223
1160
|
private fun applyPendingPlayerState(player: Player) {
|
|
1224
1161
|
pendingRepeatMode?.let {
|
|
1225
1162
|
player.repeatMode = it
|
|
1226
1163
|
pendingRepeatMode = null
|
|
1227
1164
|
}
|
|
1228
1165
|
pendingPlayWhenReady?.let {
|
|
1229
|
-
player.
|
|
1166
|
+
player.applySetupPlayWhenReady(it)
|
|
1230
1167
|
pendingPlayWhenReady = null
|
|
1231
1168
|
}
|
|
1232
1169
|
}
|
|
@@ -1235,17 +1172,36 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1235
1172
|
mainScope.coroutineContext.cancelChildren()
|
|
1236
1173
|
mediaBrowserFuture = null
|
|
1237
1174
|
connectedService = null
|
|
1175
|
+
connectionReady = CompletableDeferred()
|
|
1238
1176
|
Timber.d("AudioBrowser.onServiceDisconnected()")
|
|
1239
1177
|
}
|
|
1240
1178
|
|
|
1179
|
+
// Android never reconnects a dead binding: release it so the next setupPlayer binds afresh.
|
|
1180
|
+
override fun onBindingDied(name: ComponentName) = dropDeadBinding()
|
|
1181
|
+
|
|
1182
|
+
override fun onNullBinding(name: ComponentName) = dropDeadBinding()
|
|
1183
|
+
|
|
1184
|
+
private fun dropDeadBinding() {
|
|
1185
|
+
serviceBinding.unbind(this)
|
|
1186
|
+
connectionReady.completeExceptionally(IllegalStateException("AudioBrowserService binding died"))
|
|
1187
|
+
connectionReady = CompletableDeferred()
|
|
1188
|
+
}
|
|
1189
|
+
|
|
1241
1190
|
// ============================================================================
|
|
1242
1191
|
// MARK: Internal Helpers
|
|
1243
1192
|
// ============================================================================
|
|
1244
1193
|
|
|
1194
|
+
private fun <T> promise(run: suspend () -> T): Promise<T> {
|
|
1195
|
+
val promise = Promise<T>()
|
|
1196
|
+
mainScope.launchSettled({ it.fold(promise::resolve, promise::reject) }, run)
|
|
1197
|
+
return promise
|
|
1198
|
+
}
|
|
1199
|
+
|
|
1245
1200
|
private fun launchInScope(block: suspend () -> Unit) {
|
|
1246
1201
|
mainScope.launch { block() }
|
|
1247
1202
|
}
|
|
1248
1203
|
|
|
1204
|
+
// For calls arriving on the JS thread: called on main it waits on itself and deadlocks.
|
|
1249
1205
|
private fun <T> runBlockingOnMain(block: suspend () -> T): T {
|
|
1250
1206
|
return runBlocking(mainScope.coroutineContext) { block() }
|
|
1251
1207
|
}
|
|
@@ -1253,6 +1209,25 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1253
1209
|
private val service: Service
|
|
1254
1210
|
get() = connectedService ?: throw Exception("Player not initialized")
|
|
1255
1211
|
|
|
1212
|
+
private val connectedPlayer: Player?
|
|
1213
|
+
get() = connectedService?.player
|
|
1214
|
+
|
|
1215
|
+
/** What [read] gets from the player, or without one [fallback], the answer iOS gives then. */
|
|
1216
|
+
private fun <T> readPlayer(fallback: T, read: suspend (Player) -> T): T = runBlockingOnMain {
|
|
1217
|
+
val player = connectedPlayer ?: return@runBlockingOnMain fallback
|
|
1218
|
+
read(player)
|
|
1219
|
+
}
|
|
1220
|
+
|
|
1221
|
+
/** Runs [command] on the player; without one it is dropped with a warning, as iOS drops it. */
|
|
1222
|
+
private fun commandPlayer(name: String, command: suspend (Player) -> Unit) = runBlockingOnMain {
|
|
1223
|
+
val player = connectedPlayer
|
|
1224
|
+
if (player == null) {
|
|
1225
|
+
Timber.w("$name before the player is set up, or while its service restarts: ignored")
|
|
1226
|
+
} else {
|
|
1227
|
+
command(player)
|
|
1228
|
+
}
|
|
1229
|
+
}
|
|
1230
|
+
|
|
1256
1231
|
internal val player
|
|
1257
1232
|
get() = service.player
|
|
1258
1233
|
|
|
@@ -1330,7 +1305,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1330
1305
|
true
|
|
1331
1306
|
} ?: false
|
|
1332
1307
|
|
|
1333
|
-
// Defer notification until after play operation completes
|
|
1334
1308
|
post { this@AudioBrowser.onRemotePlay() }
|
|
1335
1309
|
|
|
1336
1310
|
return handled
|
|
@@ -1343,7 +1317,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1343
1317
|
true
|
|
1344
1318
|
} ?: false
|
|
1345
1319
|
|
|
1346
|
-
// Defer notification until after pause operation completes
|
|
1347
1320
|
post { this@AudioBrowser.onRemotePause() }
|
|
1348
1321
|
|
|
1349
1322
|
return handled
|
|
@@ -1356,7 +1329,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1356
1329
|
true
|
|
1357
1330
|
} ?: false
|
|
1358
1331
|
|
|
1359
|
-
// Defer notification until after stop operation completes
|
|
1360
1332
|
post { this@AudioBrowser.onRemoteStop() }
|
|
1361
1333
|
|
|
1362
1334
|
return handled
|
|
@@ -1369,7 +1341,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1369
1341
|
true
|
|
1370
1342
|
} ?: false
|
|
1371
1343
|
|
|
1372
|
-
// Defer notification until after next operation completes
|
|
1373
1344
|
post { this@AudioBrowser.onRemoteNext() }
|
|
1374
1345
|
|
|
1375
1346
|
return handled
|
|
@@ -1382,7 +1353,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1382
1353
|
true
|
|
1383
1354
|
} ?: false
|
|
1384
1355
|
|
|
1385
|
-
// Defer notification until after previous operation completes
|
|
1386
1356
|
post { this@AudioBrowser.onRemotePrevious() }
|
|
1387
1357
|
|
|
1388
1358
|
return handled
|
|
@@ -1395,7 +1365,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1395
1365
|
true
|
|
1396
1366
|
} ?: false
|
|
1397
1367
|
|
|
1398
|
-
// Defer notification until after jump forward operation completes
|
|
1399
1368
|
post { this@AudioBrowser.onRemoteJumpForward(event) }
|
|
1400
1369
|
|
|
1401
1370
|
return handled
|
|
@@ -1408,7 +1377,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1408
1377
|
true
|
|
1409
1378
|
} ?: false
|
|
1410
1379
|
|
|
1411
|
-
// Defer notification until after jump backward operation completes
|
|
1412
1380
|
post { this@AudioBrowser.onRemoteJumpBackward(event) }
|
|
1413
1381
|
|
|
1414
1382
|
return handled
|
|
@@ -1421,7 +1389,6 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1421
1389
|
true
|
|
1422
1390
|
} ?: false
|
|
1423
1391
|
|
|
1424
|
-
// Defer notification until after seek operation completes
|
|
1425
1392
|
post { this@AudioBrowser.onRemoteSeek(event) }
|
|
1426
1393
|
|
|
1427
1394
|
return handled
|
|
@@ -1453,20 +1420,29 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1453
1420
|
}
|
|
1454
1421
|
|
|
1455
1422
|
companion object {
|
|
1456
|
-
// Process-wide
|
|
1457
|
-
//
|
|
1458
|
-
//
|
|
1459
|
-
// process: AudioBrowser instances are re-created on a JS reload, and a
|
|
1460
|
-
// per-instance observeForever would leak each one. The latest instance's
|
|
1461
|
-
// callback registers as the single notification target (mirrors the iOS
|
|
1462
|
-
// static + shared-instance pattern).
|
|
1423
|
+
// Process-wide, from androidx.car.app CarConnection, observed once per process: instances are
|
|
1424
|
+
// re-created on each JS reload, and a per-instance observeForever would leak each one. The
|
|
1425
|
+
// latest instance's callback is the single target (mirrors iOS).
|
|
1463
1426
|
@Volatile private var carConnected = false
|
|
1464
|
-
@Volatile
|
|
1427
|
+
// Compare-and-set, not @Volatile: a disposing instance clears the slot only if it still owns
|
|
1428
|
+
// it, and a replacement may be claiming it at the same moment.
|
|
1429
|
+
private val carConnectionTarget = AtomicReference<((Boolean) -> Unit)?>(null)
|
|
1465
1430
|
private var carConnectionObserverStarted = false
|
|
1466
1431
|
|
|
1432
|
+
// The instance the current JS runtime uses: Nitro keeps no registry for teardown to find it in.
|
|
1433
|
+
private val current = AtomicReference<AudioBrowser?>(null)
|
|
1434
|
+
|
|
1435
|
+
/** Called by [AudioBrowserLifecycleModule] when the React instance is torn down. */
|
|
1436
|
+
internal fun disposeCurrent() {
|
|
1437
|
+
current.getAndSet(null)?.dispose()
|
|
1438
|
+
}
|
|
1439
|
+
|
|
1440
|
+
private val defaultResolveGate: (NativeGateRequest) -> Promise<Promise<GateDecision>> = {
|
|
1441
|
+
Promise.resolved(Promise.resolved(GateDecision(gated = true, gate = null)))
|
|
1442
|
+
}
|
|
1443
|
+
|
|
1467
1444
|
private fun startCarConnectionObserver(context: Context, handler: Handler) {
|
|
1468
|
-
//
|
|
1469
|
-
// single-start guard is then only ever touched from one thread.
|
|
1445
|
+
// LiveData observation is main-thread only, which also keeps the start guard on one thread.
|
|
1470
1446
|
handler.post {
|
|
1471
1447
|
if (carConnectionObserverStarted) return@post
|
|
1472
1448
|
carConnectionObserverStarted = true
|
|
@@ -1474,9 +1450,159 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1474
1450
|
val connected = type != CarConnection.CONNECTION_TYPE_NOT_CONNECTED
|
|
1475
1451
|
if (connected == carConnected) return@observeForever
|
|
1476
1452
|
carConnected = connected
|
|
1477
|
-
carConnectionTarget?.invoke(connected)
|
|
1453
|
+
carConnectionTarget.get()?.invoke(connected)
|
|
1478
1454
|
}
|
|
1479
1455
|
}
|
|
1480
1456
|
}
|
|
1481
1457
|
}
|
|
1482
1458
|
}
|
|
1459
|
+
|
|
1460
|
+
// MARK: Deep JS-callback stripping (used by dispose)
|
|
1461
|
+
// A JS function field added at any level of the config must be nulled by its type's strip.
|
|
1462
|
+
|
|
1463
|
+
private fun NativeBrowserConfiguration.strippingJSCallbacks() =
|
|
1464
|
+
copy(
|
|
1465
|
+
requestResolver = null,
|
|
1466
|
+
browseResolver = null,
|
|
1467
|
+
handleTrackLoad = null,
|
|
1468
|
+
viewMoreTitle = null,
|
|
1469
|
+
resolveAlbumPath = null,
|
|
1470
|
+
formatNavigationError = null,
|
|
1471
|
+
request = request?.strippingJSCallbacks(),
|
|
1472
|
+
browse = browse?.strippingJSCallbacks(),
|
|
1473
|
+
media = media?.strippingJSCallbacks(),
|
|
1474
|
+
artwork = artwork?.strippingJSCallbacks(),
|
|
1475
|
+
nowPlayingArtwork = nowPlayingArtwork?.strippingJSCallbacks(),
|
|
1476
|
+
routes = routes?.map { it.strippingJSCallbacks() }?.toTypedArray(),
|
|
1477
|
+
)
|
|
1478
|
+
|
|
1479
|
+
private fun TransformableRequestConfig.strippingJSCallbacks() =
|
|
1480
|
+
copy(transform = null, transformSync = null)
|
|
1481
|
+
|
|
1482
|
+
private fun MediaRequestConfig.strippingJSCallbacks() =
|
|
1483
|
+
copy(resolve = null, resolveSync = null, transform = null, transformSync = null)
|
|
1484
|
+
|
|
1485
|
+
private fun ArtworkRequestConfig.strippingJSCallbacks() =
|
|
1486
|
+
copy(resolve = null, resolveSync = null, transform = null, transformSync = null)
|
|
1487
|
+
|
|
1488
|
+
private fun NativeRouteEntry.strippingJSCallbacks() =
|
|
1489
|
+
copy(
|
|
1490
|
+
browseCallback = null,
|
|
1491
|
+
browseConfig = browseConfig?.strippingJSCallbacks(),
|
|
1492
|
+
searchCallback = null,
|
|
1493
|
+
searchConfig = searchConfig?.strippingJSCallbacks(),
|
|
1494
|
+
media = media?.strippingJSCallbacks(),
|
|
1495
|
+
artwork = artwork?.strippingJSCallbacks(),
|
|
1496
|
+
)
|
|
1497
|
+
|
|
1498
|
+
/**
|
|
1499
|
+
* The navigation error [e] raises, shared by failed navigations, the rejection
|
|
1500
|
+
* [AudioBrowser.search] hands JS and the Android Auto browse-error tile, so one failure is named
|
|
1501
|
+
* one way wherever it surfaces.
|
|
1502
|
+
*/
|
|
1503
|
+
internal fun navigationErrorFor(e: Exception): NavigationError =
|
|
1504
|
+
when (e) {
|
|
1505
|
+
is HttpStatusException ->
|
|
1506
|
+
NavigationError(
|
|
1507
|
+
NavigationErrorType.HTTP_ERROR,
|
|
1508
|
+
e.message ?: "Server error",
|
|
1509
|
+
e.statusCode.toDouble(),
|
|
1510
|
+
e.statusCode in 200..299,
|
|
1511
|
+
)
|
|
1512
|
+
is NetworkException ->
|
|
1513
|
+
NavigationError(
|
|
1514
|
+
NavigationErrorType.NETWORK_ERROR,
|
|
1515
|
+
e.message ?: "Network request failed",
|
|
1516
|
+
null,
|
|
1517
|
+
null,
|
|
1518
|
+
)
|
|
1519
|
+
is ContentNotFoundException ->
|
|
1520
|
+
NavigationError(
|
|
1521
|
+
NavigationErrorType.CONTENT_NOT_FOUND,
|
|
1522
|
+
e.message ?: "Content not found",
|
|
1523
|
+
null,
|
|
1524
|
+
null,
|
|
1525
|
+
)
|
|
1526
|
+
is CallbackException ->
|
|
1527
|
+
NavigationError(
|
|
1528
|
+
NavigationErrorType.CALLBACK_ERROR,
|
|
1529
|
+
e.message ?: "An error occurred",
|
|
1530
|
+
null,
|
|
1531
|
+
null,
|
|
1532
|
+
)
|
|
1533
|
+
else ->
|
|
1534
|
+
NavigationError(
|
|
1535
|
+
NavigationErrorType.UNKNOWN_ERROR,
|
|
1536
|
+
e.message ?: "An unexpected error occurred",
|
|
1537
|
+
null,
|
|
1538
|
+
null,
|
|
1539
|
+
)
|
|
1540
|
+
}
|
|
1541
|
+
|
|
1542
|
+
/** Carries a [NavigationError] across a rejected Promise, whose JS error keeps its message. */
|
|
1543
|
+
class NavigationErrorException(val error: NavigationError) : Exception(error.message)
|
|
1544
|
+
|
|
1545
|
+
/** The built-in display copy for [error], and the fallback when the app's formatter fails. */
|
|
1546
|
+
internal fun defaultFormattedError(error: NavigationError): FormattedNavigationError {
|
|
1547
|
+
val title =
|
|
1548
|
+
when (error.code) {
|
|
1549
|
+
NavigationErrorType.CONTENT_NOT_FOUND -> "Content Not Found"
|
|
1550
|
+
NavigationErrorType.NETWORK_ERROR -> "Network Error"
|
|
1551
|
+
NavigationErrorType.HTTP_ERROR -> {
|
|
1552
|
+
error.statusCode?.let { httpStatusText(it.toInt()) } ?: "Server Error"
|
|
1553
|
+
}
|
|
1554
|
+
NavigationErrorType.CALLBACK_ERROR -> "Error"
|
|
1555
|
+
NavigationErrorType.UNKNOWN_ERROR -> "Error"
|
|
1556
|
+
// Not a failure: a container that resolved with no children (ADR 0001).
|
|
1557
|
+
NavigationErrorType.EMPTY_CONTENT -> "Nothing here"
|
|
1558
|
+
NavigationErrorType.TIMEOUT -> "Couldn't load"
|
|
1559
|
+
}
|
|
1560
|
+
// An empty message is omitted so it renders title-only.
|
|
1561
|
+
return FormattedNavigationError(title, error.message.takeIf { it.isNotEmpty() })
|
|
1562
|
+
}
|
|
1563
|
+
|
|
1564
|
+
/** The app's formatted error from [format], or [default] when it returns null or throws. */
|
|
1565
|
+
internal suspend fun formattedOrDefault(
|
|
1566
|
+
default: FormattedNavigationError,
|
|
1567
|
+
format: suspend () -> FormattedNavigationError?,
|
|
1568
|
+
): FormattedNavigationError =
|
|
1569
|
+
try {
|
|
1570
|
+
format()
|
|
1571
|
+
} catch (e: CancellationException) {
|
|
1572
|
+
throw e
|
|
1573
|
+
} catch (e: Exception) {
|
|
1574
|
+
null
|
|
1575
|
+
} ?: default
|
|
1576
|
+
|
|
1577
|
+
/**
|
|
1578
|
+
* Runs [run] in this scope and hands its outcome to [settle] once. Unlike Nitro's `Promise.async`,
|
|
1579
|
+
* a scope cancelled before [run] starts still settles, with the cancellation, and [run] never runs.
|
|
1580
|
+
*/
|
|
1581
|
+
@OptIn(DelicateCoroutinesApi::class)
|
|
1582
|
+
internal fun <T> CoroutineScope.launchSettled(settle: (Result<T>) -> Unit, run: suspend () -> T) {
|
|
1583
|
+
launch(start = CoroutineStart.ATOMIC) {
|
|
1584
|
+
settle(
|
|
1585
|
+
runCatching {
|
|
1586
|
+
ensureActive()
|
|
1587
|
+
run()
|
|
1588
|
+
}
|
|
1589
|
+
)
|
|
1590
|
+
}
|
|
1591
|
+
}
|
|
1592
|
+
|
|
1593
|
+
private fun httpStatusText(statusCode: Int): String {
|
|
1594
|
+
return when (statusCode) {
|
|
1595
|
+
400 -> "Bad Request"
|
|
1596
|
+
401 -> "Unauthorized"
|
|
1597
|
+
403 -> "Forbidden"
|
|
1598
|
+
404 -> "Not Found"
|
|
1599
|
+
405 -> "Method Not Allowed"
|
|
1600
|
+
408 -> "Request Timeout"
|
|
1601
|
+
429 -> "Too Many Requests"
|
|
1602
|
+
500 -> "Internal Server Error"
|
|
1603
|
+
502 -> "Bad Gateway"
|
|
1604
|
+
503 -> "Service Unavailable"
|
|
1605
|
+
504 -> "Gateway Timeout"
|
|
1606
|
+
else -> "Server Error"
|
|
1607
|
+
}
|
|
1608
|
+
}
|