react-native-audio-browser 0.2.0-next.4 → 0.2.0-next.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -22
- package/android/build.gradle +42 -15
- package/android/gradle.properties +2 -2
- package/android/src/main/AndroidManifest.xml +3 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +543 -280
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +38 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +18 -2
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +131 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +9 -6
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +315 -213
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +31 -23
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +288 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +97 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +70 -29
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +20 -3
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +4 -5
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +24 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +10 -6
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +7 -0
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +12 -12
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +111 -58
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +77 -0
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +63 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +34 -12
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +530 -230
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +218 -252
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +23 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +26 -14
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +113 -78
- package/android/src/main/java/com/audiobrowser/player/Player.kt +130 -63
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +12 -4
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +67 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +168 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +35 -7
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +278 -59
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +62 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +56 -52
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +152 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -34
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +346 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +70 -5
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +301 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -55
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +160 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +385 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +101 -58
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +45 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +3 -4
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +48 -16
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +92 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +185 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +197 -7
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +325 -4
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +83 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +55 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +162 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/ios/AVPlayerEngine.swift +362 -0
- package/ios/AVPlayerEngineCallbacks.swift +14 -0
- package/ios/Browser/BrowseGate.swift +58 -0
- package/ios/Browser/BrowserConfig.swift +115 -81
- package/ios/Browser/BrowserError.swift +16 -0
- package/ios/Browser/BrowserManager.swift +155 -654
- package/ios/Browser/BrowserPathHelper.swift +68 -51
- package/ios/Browser/FavoriteSet.swift +46 -0
- package/ios/Browser/InertStyleDiagnostic.swift +296 -0
- package/ios/Browser/JsonModels.swift +270 -321
- package/ios/Browser/NavigationErrorState.swift +41 -0
- package/ios/Browser/PageResolver.swift +147 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +303 -0
- package/ios/Browser/SearchDrillIn.swift +7 -7
- package/ios/Browser/SectionScope.swift +82 -23
- package/ios/Browser/SimpleRouter.swift +73 -144
- package/ios/Browser/StyleResolver.swift +58 -0
- package/ios/Browser/TabBarEntries.swift +9 -3
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +93 -43
- package/ios/CarPlay/CarPlayArtworkResolver.swift +36 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +91 -163
- package/ios/CarPlay/CarPlayListItemFactory.swift +288 -102
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +137 -177
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +91 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +192 -0
- package/ios/CarPlay/CarPlaySession.swift +207 -0
- package/ios/CarPlay/CarPlayTemplates.swift +63 -0
- package/ios/CarPlay/IntentHandlers.swift +96 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +105 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +21 -25
- package/ios/CarPlay/MediaIntentPlayback.swift +74 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +35 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +77 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +96 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/NavigationError+Conversion.swift +14 -4
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +13 -15
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +29 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -4
- package/ios/Extension/Track+AVPlayer.swift +0 -16
- package/ios/Extension/Track+Copying.swift +11 -13
- package/ios/Extension/Track+Identity.swift +25 -0
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Http/HttpClient.swift +71 -165
- package/ios/HybridAudioBrowser+Browser.swift +136 -0
- package/ios/HybridAudioBrowser+Options.swift +105 -0
- package/ios/HybridAudioBrowser+Player.swift +341 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +157 -0
- package/ios/HybridAudioBrowser+Stubs.swift +46 -0
- package/ios/HybridAudioBrowser.swift +132 -1652
- package/ios/Model/NitroTypeStubs.swift +239 -24
- package/ios/Model/PlayerUpdateOptions.swift +10 -1
- package/ios/Model/RemoteCommand.swift +6 -60
- package/ios/Model/TrackPlayerError.swift +2 -2
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +18 -53
- package/ios/Observer/ItemObserver.swift +90 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +42 -92
- package/ios/Player/AudioSessionController.swift +191 -0
- package/ios/Player/DeferredSeek.swift +70 -0
- package/ios/Player/ErrorStatus.swift +50 -0
- package/ios/Player/MediaLoader.swift +66 -87
- package/ios/Player/NowPlayingLines.swift +36 -0
- package/ios/Player/NowPlayingUpdater.swift +180 -85
- package/ios/Player/PlaybackFailure.swift +125 -0
- package/ios/Player/PlaybackPersistence.swift +73 -0
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/Player.swift +960 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +104 -0
- package/ios/Player/PlayerStatusTypes.swift +2 -6
- package/ios/Player/QueueManager.swift +93 -67
- package/ios/Player/RetryLoop.swift +291 -0
- package/ios/Player/ShuffleOrder.swift +33 -0
- package/ios/Player/SleepTimerManager.swift +14 -16
- package/ios/Player/VolumeFader.swift +5 -0
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +43 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +100 -333
- package/ios/Tests/BrowserPathHelperTests.swift +89 -15
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/DeferredSeekTests.swift +70 -0
- package/ios/Tests/EmitterTests.swift +22 -38
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +60 -0
- package/ios/Tests/GenerationMemoTests.swift +121 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +209 -0
- package/ios/Tests/JsonModelsTests.swift +194 -1
- package/ios/Tests/LRUCacheTests.swift +110 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +57 -46
- package/ios/Tests/MediaLoaderTests.swift +36 -67
- package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
- package/ios/Tests/NowPlayingLinesTests.swift +43 -0
- package/ios/Tests/ObserverTests.swift +88 -0
- package/ios/Tests/PlaybackErrorTests.swift +76 -0
- package/ios/Tests/PlaybackFailureTests.swift +189 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +93 -0
- package/ios/Tests/PlayerPolicyTests.swift +460 -0
- package/ios/Tests/{PlaybackCoordinatorTests.swift → PlayerTests.swift} +489 -311
- package/ios/Tests/PlayingStateTests.swift +42 -0
- package/ios/Tests/QueueManagerTests.swift +196 -115
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +181 -0
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -35
- package/ios/Tests/RetryLoopTests.swift +305 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +98 -0
- package/ios/Tests/SectionScopeTests.swift +139 -54
- package/ios/Tests/SimpleRouterTests.swift +38 -3
- package/ios/Tests/SleepTimerManagerTests.swift +65 -41
- package/ios/Tests/StyleResolverTests.swift +132 -0
- package/ios/Tests/Support/TestTypes.swift +146 -101
- package/ios/Tests/TabBarEntriesTests.swift +19 -19
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +42 -0
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +62 -65
- package/ios/Util/ArtworkImageFetcher.swift +58 -1
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Emitter.swift +40 -12
- package/ios/Util/GenerationMemo.swift +36 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +32 -32
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +56 -0
- package/ios/Util/SFSymbolRenderer.swift +59 -31
- package/ios/Util/SVGProcessor.swift +9 -12
- package/lib/commonjs/AudioBrowser.js +8 -8
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +52 -0
- package/lib/commonjs/features/browser-config.js +12 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +11 -3
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +1 -1
- package/lib/commonjs/features/equalizer.js +1 -1
- package/lib/commonjs/features/errors.js +3 -3
- package/lib/commonjs/features/favorites.js +14 -11
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +16 -1
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +20 -3
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +1 -1
- package/lib/commonjs/features/nowPlaying.js +1 -1
- package/lib/commonjs/features/output.js +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +1 -1
- package/lib/commonjs/features/playback/playing.js +1 -1
- package/lib/commonjs/features/playback/progress.js +3 -2
- 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 +3 -4
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +0 -6
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +1 -1
- package/lib/commonjs/features/player/options.js +48 -34
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +18 -9
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +23 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -0
- package/lib/commonjs/features/queue/activeTrack.js +15 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +13 -6
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +1 -1
- package/lib/commonjs/features/queue/shuffle.js +1 -1
- package/lib/commonjs/features/remoteControls.js +13 -92
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +13 -1
- 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 +28 -14
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +202 -77
- 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 +254 -39
- 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 +33 -12
- 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/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 +62 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -1
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +52 -0
- package/lib/module/features/browser-config.js +12 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +11 -3
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +1 -1
- package/lib/module/features/equalizer.js +1 -1
- package/lib/module/features/errors.js +3 -3
- package/lib/module/features/favorites.js +14 -11
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +16 -1
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +20 -3
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +1 -1
- package/lib/module/features/nowPlaying.js +1 -1
- package/lib/module/features/output.js +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +1 -1
- package/lib/module/features/playback/playing.js +1 -1
- package/lib/module/features/playback/progress.js +3 -2
- 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 +3 -4
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +0 -5
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +1 -1
- package/lib/module/features/player/options.js +47 -32
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +17 -8
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +19 -0
- package/lib/module/features/player/validateOptions.js.map +1 -0
- package/lib/module/features/queue/activeTrack.js +15 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +13 -6
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +1 -1
- package/lib/module/features/queue/shuffle.js +1 -1
- package/lib/module/features/remoteControls.js +13 -92
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +13 -1
- 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 +28 -14
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +202 -77
- 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 +254 -39
- 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 +33 -12
- 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/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 +62 -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 -1
- package/lib/typescript/src/AudioBrowser.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 +10 -2
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +1 -1
- package/lib/typescript/src/features/errors.d.ts +3 -3
- package/lib/typescript/src/features/favorites.d.ts +14 -11
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +18 -2
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +20 -3
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
- package/lib/typescript/src/features/output.d.ts +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +1 -1
- 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 +3 -4
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +1 -1
- package/lib/typescript/src/features/player/options.d.ts +108 -56
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +14 -4
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
- package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +7 -4
- 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/shuffle.d.ts +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +23 -22
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +1 -1
- package/lib/typescript/src/features/sleepTimer.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 +387 -126
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +93 -61
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +19 -16
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -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/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +1 -2
- 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 +12 -12
- 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 +9 -12
- 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 -53
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +3 -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 +17 -14
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +9 -12
- 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 +12 -12
- 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 +9 -12
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +2 -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++/{JNotificationButton.hpp → JRemoteButton.hpp} +19 -19
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +86 -0
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- 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 +18 -12
- 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.cpp +26 -0
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +75 -0
- 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 +20 -3
- 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 +3 -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 +29 -0
- 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 +20 -3
- 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/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/{NotificationButton.kt → RemoteButton.kt} +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +61 -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/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 +17 -0
- 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_NotificationButtonLayout.kt → Variant_NullType_RemoteButtonLayout.kt} +24 -15
- 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 +779 -665
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +34 -16
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +36 -18
- package/nitrogen/generated/ios/swift/AndroidOptions.swift +12 -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 +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -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/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroAndroidUpdateOptions.swift +12 -12
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/{NotificationButton.swift → RemoteButton.swift} +6 -6
- package/nitrogen/generated/ios/swift/RemoteButtonLayout.swift +57 -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/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 +30 -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++/AndroidOptions.hpp +8 -8
- 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 +1 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -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++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroAndroidUpdateOptions.hpp +8 -8
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/{NotificationButton.hpp → RemoteButton.hpp} +19 -19
- package/nitrogen/generated/shared/c++/RemoteButtonLayout.hpp +94 -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++/TrackStyle.hpp +73 -34
- package/package.json +24 -11
- package/src/AudioBrowser.ts +2 -1
- package/src/CLAUDE.md +52 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +12 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +11 -3
- package/src/features/carConnection.ts +1 -1
- package/src/features/equalizer.ts +1 -1
- package/src/features/errors.ts +3 -3
- package/src/features/favorites.ts +14 -11
- package/src/features/gate.ts +16 -1
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +20 -3
- package/src/features/network.ts +1 -1
- package/src/features/nowPlaying.ts +1 -1
- package/src/features/output.ts +1 -1
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/playWhenReady.ts +1 -1
- package/src/features/playback/playing.ts +1 -1
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +3 -2
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +3 -4
- package/src/features/playback/trackPlaybackTime.test.ts +16 -6
- package/src/features/playback/trackPlaybackTime.ts +1 -6
- package/src/features/playback/volume.ts +1 -1
- package/src/features/player/options.ts +126 -76
- package/src/features/player/setup.test.ts +24 -7
- package/src/features/player/setup.ts +22 -10
- package/src/features/player/validateOptions.ts +21 -0
- package/src/features/queue/activeTrack.ts +15 -4
- package/src/features/queue/queue.ts +13 -6
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +1 -1
- package/src/features/remoteControls.ts +13 -92
- package/src/features/sleepTimer.test.ts +172 -0
- package/src/features/sleepTimer.ts +9 -1
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +147 -0
- package/src/specs/audio-browser.nitro.ts +5 -4
- 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 +403 -134
- package/src/types/browser.ts +97 -63
- package/src/utils/LazyNativeEmitter.ts +28 -15
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useNativeUpdatedValue.test.ts +103 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +241 -84
- 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 +5 -3
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +284 -37
- 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 +33 -14
- 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/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 +70 -13
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +135 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +587 -0
- package/website/guide/carplay.md +650 -0
- package/website/guide/configuration.md +173 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +247 -0
- 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/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 -322
- 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/LoadSeekCoordinatorTests.swift +0 -325
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -86
- 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++/JNotificationButtonLayout.hpp +0 -94
- 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/c++/JVariant_NullType_NotificationButtonLayout.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.hpp +0 -75
- 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/NotificationButtonLayout.kt +0 -50
- 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/NotificationButtonLayout.swift +0 -92
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/ios/swift/Variant_NullType_NotificationButtonLayout.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
- package/nitrogen/generated/shared/c++/NotificationButtonLayout.hpp +0 -102
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
package com.audiobrowser.player
|
|
2
2
|
|
|
3
3
|
import android.os.Bundle
|
|
4
|
+
import androidx.core.content.ContextCompat
|
|
4
5
|
import androidx.media3.common.MediaItem
|
|
5
6
|
import androidx.media3.common.MediaMetadata
|
|
6
7
|
import androidx.media3.common.Rating
|
|
@@ -11,22 +12,33 @@ import androidx.media3.session.MediaSession
|
|
|
11
12
|
import androidx.media3.session.SessionCommand
|
|
12
13
|
import androidx.media3.session.SessionError
|
|
13
14
|
import androidx.media3.session.SessionResult
|
|
15
|
+
import com.audiobrowser.browser.BrowserManager
|
|
14
16
|
import com.audiobrowser.browser.handleTrackLoad
|
|
17
|
+
import com.audiobrowser.browser.normalizedSections
|
|
18
|
+
import com.audiobrowser.browser.styleResolvedSections
|
|
19
|
+
import com.audiobrowser.browser.untitledSection
|
|
20
|
+
import com.audiobrowser.extension.indexOfTappedTrack
|
|
15
21
|
import com.audiobrowser.extension.toTrack
|
|
22
|
+
import com.audiobrowser.navigationErrorFor
|
|
16
23
|
import com.audiobrowser.util.BrowserPathHelper
|
|
17
24
|
import com.audiobrowser.util.RatingFavorites
|
|
18
25
|
import com.audiobrowser.util.TrackFactory
|
|
19
26
|
import com.google.common.collect.ImmutableList
|
|
27
|
+
import com.google.common.util.concurrent.FutureCallback
|
|
20
28
|
import com.google.common.util.concurrent.Futures
|
|
21
29
|
import com.google.common.util.concurrent.ListenableFuture
|
|
30
|
+
import com.margelo.nitro.audiobrowser.FormattedNavigationError
|
|
22
31
|
import com.margelo.nitro.audiobrowser.Gate
|
|
23
32
|
import com.margelo.nitro.audiobrowser.GateEvent
|
|
24
33
|
import com.margelo.nitro.audiobrowser.GateReason
|
|
25
34
|
import com.margelo.nitro.audiobrowser.MediaReference
|
|
26
35
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
27
|
-
import com.margelo.nitro.audiobrowser.
|
|
36
|
+
import com.margelo.nitro.audiobrowser.NavigationError
|
|
37
|
+
import com.margelo.nitro.audiobrowser.NavigationErrorType
|
|
28
38
|
import com.margelo.nitro.audiobrowser.PlayerCapabilities
|
|
39
|
+
import com.margelo.nitro.audiobrowser.RemoteButtonLayout
|
|
29
40
|
import com.margelo.nitro.audiobrowser.SearchParams
|
|
41
|
+
import com.margelo.nitro.audiobrowser.Section
|
|
30
42
|
import com.margelo.nitro.audiobrowser.Track
|
|
31
43
|
import kotlinx.coroutines.CancellationException
|
|
32
44
|
import kotlinx.coroutines.CoroutineScope
|
|
@@ -40,8 +52,12 @@ import kotlinx.coroutines.withContext
|
|
|
40
52
|
import timber.log.Timber
|
|
41
53
|
|
|
42
54
|
/**
|
|
43
|
-
*
|
|
44
|
-
*
|
|
55
|
+
* Everything the MediaLibrarySession serves except transport: browse, search, item lookup, queue
|
|
56
|
+
* building, playback resumption, and the favorite and rating commands. Transport does not arrive
|
|
57
|
+
* here — it reaches the player through [InterceptingPlayer], and Assistant's play-from-search
|
|
58
|
+
* arrives as an intent handled in the service. The callbacks that answer through [scope] run on IO,
|
|
59
|
+
* so anything touching the ExoPlayer instance hops back to [Dispatchers.Main]; the rest answer
|
|
60
|
+
* synchronously on the Media3 application thread.
|
|
45
61
|
*/
|
|
46
62
|
class MediaSessionCallback(private val player: Player) :
|
|
47
63
|
MediaLibraryService.MediaLibrarySession.Callback {
|
|
@@ -53,6 +69,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
53
69
|
// threads (network observer, JS-triggered notifies) — guard all access with synchronized(this).
|
|
54
70
|
private val parentIdSubscriptions =
|
|
55
71
|
mutableMapOf<String, MutableSet<MediaSession.ControllerInfo>>()
|
|
72
|
+
private val failedSearch = FailedSearchSlot()
|
|
73
|
+
private val offlineSearches = OfflineSearchRegistry()
|
|
56
74
|
private var mediaLibrarySession: MediaLibraryService.MediaLibrarySession? = null
|
|
57
75
|
|
|
58
76
|
/**
|
|
@@ -64,14 +82,15 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
64
82
|
private set
|
|
65
83
|
|
|
66
84
|
init {
|
|
67
|
-
|
|
68
|
-
|
|
85
|
+
player.networkMonitor.observeOnline(scope) { online ->
|
|
86
|
+
notifySubscribedChildrenChanged()
|
|
87
|
+
// A browse level is re-queried through its subscription; a search has none, so its offline
|
|
88
|
+
// tile has to be taken off the screen by re-running the query.
|
|
89
|
+
if (online) scope.launch { reannounceOfflineSearches() }
|
|
90
|
+
}
|
|
69
91
|
}
|
|
70
92
|
|
|
71
|
-
/**
|
|
72
|
-
* Apply pagination to a list of items. If pageSize is 0 or MAX_VALUE (Android Auto default),
|
|
73
|
-
* returns the full list.
|
|
74
|
-
*/
|
|
93
|
+
/** Media3's legacy browse bridge asks for a whole list with pageSize [Int.MAX_VALUE]. */
|
|
75
94
|
private fun <T> List<T>.paginate(page: Int, pageSize: Int): List<T> {
|
|
76
95
|
return if (pageSize in 1 until Int.MAX_VALUE) {
|
|
77
96
|
this.drop(page * pageSize).take(pageSize)
|
|
@@ -80,45 +99,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
80
99
|
}
|
|
81
100
|
}
|
|
82
101
|
|
|
83
|
-
/** Creates an offline error MediaItem. */
|
|
84
|
-
private fun createOfflineMediaItem(): MediaItem =
|
|
85
|
-
createErrorMediaItem(
|
|
86
|
-
mediaId = BrowserPathHelper.OFFLINE_PATH,
|
|
87
|
-
title = player.context.getString(com.audiobrowser.R.string.audio_browser_offline_error),
|
|
88
|
-
subtitle =
|
|
89
|
-
player.context.getString(com.audiobrowser.R.string.audio_browser_offline_error_subtitle),
|
|
90
|
-
)
|
|
91
|
-
|
|
92
|
-
/**
|
|
93
|
-
* Builds a non-browsable, non-playable [MediaItem] used to surface an error inside an Android
|
|
94
|
-
* Auto / AAOS browse list. Rendered as a greyed-out, non-interactive tile, which is the only
|
|
95
|
-
* side-effect-free way to communicate a browse failure to legacy controllers (Media3 drops
|
|
96
|
-
* [LibraryResult.ofError] on the legacy browse bridge, leaving an empty "No items" screen).
|
|
97
|
-
*/
|
|
98
|
-
private fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
|
|
99
|
-
MediaItem.Builder()
|
|
100
|
-
.setMediaId(mediaId)
|
|
101
|
-
.setMediaMetadata(
|
|
102
|
-
MediaMetadata.Builder()
|
|
103
|
-
.setTitle(title)
|
|
104
|
-
.setSubtitle(subtitle)
|
|
105
|
-
// Non-browsable, non-playable. Android Auto ignores these flags and still drills into a
|
|
106
|
-
// tapped tile, but onGetChildren returns an empty list for the sentinel paths so it's a
|
|
107
|
-
// harmless "No Items" dead-end rather than an endless stack of error pages.
|
|
108
|
-
.setIsBrowsable(false)
|
|
109
|
-
.setIsPlayable(false)
|
|
110
|
-
.build()
|
|
111
|
-
)
|
|
112
|
-
.build()
|
|
113
|
-
|
|
114
|
-
/**
|
|
115
|
-
* Builds the gate tile from a per-request chrome: while a gate is active, tabs stay visible but a
|
|
116
|
-
* gated browse/search level serves this single tile (see the gate checks in [onGetChildren] /
|
|
117
|
-
* [onGetSearchResult]). Same shape as the error tiles — non-browsable, non-playable — and
|
|
118
|
-
* deliberately NOT accompanied by a SessionError: a gate is deliberate app state, not a failure.
|
|
119
|
-
* The message renders as the tile's subtitle (newlines collapse to spaces — list rows are
|
|
120
|
-
* single-line).
|
|
121
|
-
*/
|
|
122
102
|
/**
|
|
123
103
|
* Wraps a raw external-search query string into the structured [SearchParams] the gate request
|
|
124
104
|
* carries. The car search surfaces only give a free-text query, so the other fields stay null —
|
|
@@ -136,40 +116,34 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
136
116
|
reference = MediaReference.UNKNOWN,
|
|
137
117
|
)
|
|
138
118
|
|
|
139
|
-
private fun createGateMediaItem(gate: Gate): MediaItem =
|
|
140
|
-
createErrorMediaItem(
|
|
141
|
-
mediaId = BrowserPathHelper.GATE_PATH,
|
|
142
|
-
title = gate.title,
|
|
143
|
-
subtitle = gate.message?.replace('\n', ' ') ?: "",
|
|
144
|
-
)
|
|
145
|
-
|
|
146
119
|
/**
|
|
147
|
-
* Builds
|
|
148
|
-
*
|
|
149
|
-
*
|
|
150
|
-
*
|
|
120
|
+
* Builds the gate tile from a per-request chrome: while a gate is active, tabs stay visible but a
|
|
121
|
+
* gated browse/search level serves this single tile (see the gate checks in [onGetChildren] /
|
|
122
|
+
* [onGetSearchResult]). Same shape as the error tiles — non-browsable, non-playable — and
|
|
123
|
+
* deliberately NOT accompanied by a SessionError: a gate is deliberate app state, not a failure.
|
|
151
124
|
*/
|
|
152
|
-
private fun
|
|
125
|
+
private fun createGateMediaItem(gate: Gate): MediaItem =
|
|
153
126
|
createErrorMediaItem(
|
|
154
|
-
|
|
155
|
-
title
|
|
156
|
-
subtitle =
|
|
157
|
-
player.context.getString(com.audiobrowser.R.string.audio_browser_browse_error_subtitle),
|
|
127
|
+
BrowserPathHelper.GATE_PATH,
|
|
128
|
+
FormattedNavigationError(gate.title, gate.message),
|
|
158
129
|
)
|
|
159
130
|
|
|
160
131
|
fun updateMediaSession(
|
|
161
132
|
mediaSession: MediaSession,
|
|
162
133
|
capabilities: PlayerCapabilities,
|
|
163
|
-
|
|
134
|
+
remoteButtonLayout: RemoteButtonLayout?,
|
|
164
135
|
searchAvailable: Boolean,
|
|
136
|
+
forwardJumpInterval: Double,
|
|
137
|
+
backwardJumpInterval: Double,
|
|
165
138
|
) {
|
|
166
|
-
// Store as MediaLibrarySession for notifyChildrenChanged support
|
|
167
139
|
this.mediaLibrarySession = mediaSession as? MediaLibraryService.MediaLibrarySession
|
|
168
140
|
commandManager.updateMediaSession(
|
|
169
141
|
mediaSession,
|
|
170
142
|
capabilities,
|
|
171
|
-
|
|
143
|
+
remoteButtonLayout,
|
|
172
144
|
searchAvailable,
|
|
145
|
+
forwardJumpInterval,
|
|
146
|
+
backwardJumpInterval,
|
|
173
147
|
)
|
|
174
148
|
}
|
|
175
149
|
|
|
@@ -181,18 +155,34 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
181
155
|
return commandManager.buildConnectionResult(session)
|
|
182
156
|
}
|
|
183
157
|
|
|
158
|
+
override fun onDisconnected(session: MediaSession, controller: MediaSession.ControllerInfo) {
|
|
159
|
+
Timber.Forest.d("MediaSession disconnect: ${controller.packageName}")
|
|
160
|
+
// A controller that leaves without unsubscribing (Android Auto's normal exit) would otherwise
|
|
161
|
+
// be notified — and held — forever.
|
|
162
|
+
offlineSearches.forget(controller)
|
|
163
|
+
synchronized(this) {
|
|
164
|
+
parentIdSubscriptions.values.forEach { it.remove(controller) }
|
|
165
|
+
parentIdSubscriptions.entries.removeAll { (_, browsers) -> browsers.isEmpty() }
|
|
166
|
+
}
|
|
167
|
+
super.onDisconnected(session, controller)
|
|
168
|
+
}
|
|
169
|
+
|
|
184
170
|
override fun onCustomCommand(
|
|
185
171
|
session: MediaSession,
|
|
186
172
|
controller: MediaSession.ControllerInfo,
|
|
187
173
|
command: SessionCommand,
|
|
188
174
|
args: Bundle,
|
|
189
175
|
): ListenableFuture<SessionResult> {
|
|
190
|
-
//
|
|
176
|
+
// A success here makes the controller flip its heart optimistically, so a no-op (no current
|
|
177
|
+
// track) must report INVALID_STATE instead of success-then-revert.
|
|
191
178
|
if (command.customAction == MediaSessionCommandManager.CUSTOM_ACTION_FAVORITE) {
|
|
192
|
-
val
|
|
193
|
-
Timber.d("Favorite button tapped -
|
|
194
|
-
|
|
195
|
-
|
|
179
|
+
val applied = player.toggleActiveTrackFavorited()
|
|
180
|
+
Timber.d("Favorite button tapped - toggle applied=$applied")
|
|
181
|
+
return Futures.immediateFuture(
|
|
182
|
+
SessionResult(
|
|
183
|
+
if (applied) SessionResult.RESULT_SUCCESS else SessionResult.RESULT_ERROR_INVALID_STATE
|
|
184
|
+
)
|
|
185
|
+
)
|
|
196
186
|
}
|
|
197
187
|
|
|
198
188
|
if (commandManager.handleCustomCommand(command, player)) {
|
|
@@ -208,8 +198,16 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
208
198
|
): ListenableFuture<SessionResult> {
|
|
209
199
|
// A heart rating from a controller (e.g. Google Assistant "I like this") toggles the
|
|
210
200
|
// now-playing favorite. setActiveTrackFavorited fires onFavoriteChanged so the consumer
|
|
211
|
-
// persists it — the same path as the notification / CarPlay heart button.
|
|
212
|
-
|
|
201
|
+
// persists it — the same path as the notification / CarPlay heart button. Report an honest
|
|
202
|
+
// result (see onCustomCommand): INVALID_STATE when there is no current track to favorite.
|
|
203
|
+
RatingFavorites.favoritedFor(rating)?.let { favorited ->
|
|
204
|
+
val applied = player.setActiveTrackFavorited(favorited)
|
|
205
|
+
return Futures.immediateFuture(
|
|
206
|
+
SessionResult(
|
|
207
|
+
if (applied) SessionResult.RESULT_SUCCESS else SessionResult.RESULT_ERROR_INVALID_STATE
|
|
208
|
+
)
|
|
209
|
+
)
|
|
210
|
+
}
|
|
213
211
|
return super.onSetRating(session, controller, rating)
|
|
214
212
|
}
|
|
215
213
|
|
|
@@ -219,13 +217,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
219
217
|
browser: MediaSession.ControllerInfo,
|
|
220
218
|
params: MediaLibraryService.LibraryParams?,
|
|
221
219
|
): ListenableFuture<LibraryResult<MediaItem>> {
|
|
222
|
-
// Extract artwork size hint from root hints (e.g., from Android Auto)
|
|
223
|
-
// TODO: Also consider these other root hints in the future:
|
|
224
|
-
// - KEY_ROOT_HINT_MEDIA_HOST_VERSION
|
|
225
|
-
// - KEY_ROOT_HINT_MEDIA_SESSION_API
|
|
226
|
-
// - BROWSER_ROOT_HINTS_KEY_CUSTOM_BROWSER_ACTION_LIMIT
|
|
227
|
-
// - BROWSER_ROOT_HINTS_KEY_ROOT_CHILDREN_LIMIT
|
|
228
|
-
// - KEY_ROOT_HINT_MAX_QUEUE_ITEMS_WHILE_RESTRICTED
|
|
229
220
|
params?.extras?.getInt(MediaConstants.EXTRAS_KEY_MEDIA_ART_SIZE_PIXELS, 0)?.let { size ->
|
|
230
221
|
if (size > 0) {
|
|
231
222
|
artworkSizeHintPixels = size
|
|
@@ -234,13 +225,11 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
234
225
|
}
|
|
235
226
|
|
|
236
227
|
if (params?.isRecent == true) {
|
|
237
|
-
//
|
|
238
|
-
//
|
|
239
|
-
//
|
|
240
|
-
|
|
241
|
-
//
|
|
242
|
-
// an error of type 'RESULT_ERROR_NOT_SUPPORTED' for a `params.isRecent` request. See
|
|
243
|
-
// https://github.com/androidx/media/issues/355
|
|
228
|
+
// Playback resumption is served by media3 itself: it intercepts System UI's EXTRA_RECENT
|
|
229
|
+
// root request internally and answers through onPlaybackResumption, so that request never
|
|
230
|
+
// reaches this callback. Any other browser asking for a recent root gets
|
|
231
|
+
// ERROR_NOT_SUPPORTED — there is no browsable recents tree; recents are ordinary consumer
|
|
232
|
+
// content (a tab or route).
|
|
244
233
|
return Futures.immediateFuture(LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED))
|
|
245
234
|
}
|
|
246
235
|
|
|
@@ -267,10 +256,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
267
256
|
params: MediaLibraryService.LibraryParams?,
|
|
268
257
|
): ListenableFuture<LibraryResult<ImmutableList<MediaItem>>> {
|
|
269
258
|
Timber.d(
|
|
270
|
-
"onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize,
|
|
259
|
+
"onGetChildren: {parentId: $parentId, page: $page, pageSize: $pageSize, isSpecialPath: ${BrowserPathHelper.isSpecialPath(parentId)} }"
|
|
271
260
|
)
|
|
272
261
|
return scope.future {
|
|
273
|
-
// Wait for browser to be registered if it's not available yet
|
|
274
262
|
val audioBrowser =
|
|
275
263
|
player.awaitBrowser().also { Timber.d("Browser ready, proceeding with onGetChildren") }
|
|
276
264
|
val browserManager = audioBrowser.browserManager
|
|
@@ -297,54 +285,56 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
297
285
|
}
|
|
298
286
|
}
|
|
299
287
|
|
|
300
|
-
//
|
|
301
|
-
//
|
|
302
|
-
//
|
|
303
|
-
//
|
|
304
|
-
|
|
305
|
-
// notifyChildrenChanged (e.g. when connectivity returns) without any user action.
|
|
306
|
-
if (parentId == BrowserPathHelper.OFFLINE_PATH || parentId == BrowserPathHelper.ERROR_PATH) {
|
|
288
|
+
// A drill-in on the error / offline / empty tile returns nothing (see isDeadEndPath). For
|
|
289
|
+
// the offline tile, re-send the alert when still offline so a tap surfaces the explanation
|
|
290
|
+
// again — but only then, since these paths are also re-queried by notifyChildrenChanged
|
|
291
|
+
// (e.g. when connectivity returns) without any user action.
|
|
292
|
+
if (BrowserPathHelper.isDeadEndPath(parentId)) {
|
|
307
293
|
if (parentId == BrowserPathHelper.OFFLINE_PATH && !player.networkMonitor.isOnline.value) {
|
|
308
294
|
sendBrowseError(session, browser, offline = true)
|
|
309
295
|
}
|
|
310
296
|
return@future LibraryResult.ofItemList(ImmutableList.of<MediaItem>(), params)
|
|
311
297
|
}
|
|
312
298
|
|
|
313
|
-
// Show offline error when offline:
|
|
314
299
|
if (
|
|
315
300
|
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
316
301
|
) {
|
|
317
302
|
Timber.w("Network offline - returning error message for: $parentId")
|
|
318
303
|
sendBrowseError(session, browser, offline = true)
|
|
319
|
-
return@future LibraryResult.ofItemList(
|
|
304
|
+
return@future LibraryResult.ofItemList(
|
|
305
|
+
ImmutableList.of(
|
|
306
|
+
createOfflineMediaItem(audioBrowser.resolveFormattedError(offlineError(), parentId))
|
|
307
|
+
),
|
|
308
|
+
params,
|
|
309
|
+
)
|
|
320
310
|
}
|
|
321
311
|
|
|
322
312
|
try {
|
|
323
313
|
val children =
|
|
324
|
-
if (parentId == BrowserPathHelper.
|
|
325
|
-
//
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
// Return tabs as root children (limited to 4 for automotive platform compatibility)
|
|
329
|
-
// TODO: Check what Android Auto does with empty tabs list - may need to return error?
|
|
330
|
-
val tabs = browserManager.queryTabs()
|
|
314
|
+
if (parentId == BrowserPathHelper.ROOT_PATH) {
|
|
315
|
+
// Disabled tabs hide (Track.disabled) — filtered before the four-tab cap so an
|
|
316
|
+
// unavailable tab never costs an available one its slot.
|
|
317
|
+
val tabs = browserManager.queryTabs().filterNot { it.disabled == true }
|
|
331
318
|
if (tabs.size > 4) {
|
|
332
319
|
Timber.w(
|
|
333
320
|
"Root has ${tabs.size} tabs; dropping ${tabs.size - 4} (Android Auto root limit)"
|
|
334
321
|
)
|
|
335
322
|
}
|
|
336
|
-
|
|
323
|
+
toFlatMediaItems(tabs.take(4))
|
|
337
324
|
} else {
|
|
338
|
-
//
|
|
325
|
+
// Section styles arrive page-folded (`section ?? page`, ADR 0011).
|
|
339
326
|
val resolvedTrack = browserManager.resolve(parentId)
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
327
|
+
val sections =
|
|
328
|
+
resolvedTrack.styleResolvedSections()
|
|
329
|
+
?: throw IllegalStateException("Expected browsed ResolvedTrack to have sections")
|
|
330
|
+
browserManager.warnIfGridPageLacksPromise(parentId, sections)
|
|
331
|
+
// A page with no children resolved fine, so it raises no SessionError and no event —
|
|
332
|
+
// notifyChildrenChanged re-queries these paths without any user action. It serves the
|
|
333
|
+
// app's path-aware `empty-content` copy as one inert tile (ADR 0001) instead of
|
|
334
|
+
// Android Auto's bare "No items".
|
|
335
|
+
browseLevelItems(toMediaItems(sections)) {
|
|
336
|
+
audioBrowser.resolveFormattedError(emptyContentError(), parentId)
|
|
337
|
+
}
|
|
348
338
|
}
|
|
349
339
|
|
|
350
340
|
LibraryResult.ofItemList(ImmutableList.copyOf(children.paginate(page, pageSize)), params)
|
|
@@ -353,18 +343,17 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
353
343
|
// error tile. awaitBrowser's TimeoutCancellationException IS a real failure, keep that.
|
|
354
344
|
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
355
345
|
Timber.e(e, "Error getting children for parentId: $parentId")
|
|
356
|
-
//
|
|
357
|
-
//
|
|
358
|
-
// Auto. See https://github.com/androidx/media/issues/2901
|
|
359
|
-
//
|
|
360
|
-
// Verified on a head unit (2026-06): the AA browse list NEVER renders error text — not for
|
|
361
|
-
// transient sendError, sticky non-fatal replication, or fatal replication
|
|
362
|
-
// (setLibraryErrorReplicationMode). Fatal replication does show the message on the
|
|
363
|
-
// playback screen, but presents the session as STATE_ERROR with no actions, hiding the
|
|
364
|
-
// now-playing item and transport controls — not worth it. Tiles remain the only in-browse
|
|
365
|
-
// signal we control.
|
|
346
|
+
// A tile rather than a bare ofError() — see createErrorMediaItem and
|
|
347
|
+
// https://github.com/androidx/media/issues/2901
|
|
366
348
|
sendBrowseError(session, browser, offline = false)
|
|
367
|
-
LibraryResult.ofItemList(
|
|
349
|
+
LibraryResult.ofItemList(
|
|
350
|
+
ImmutableList.of(
|
|
351
|
+
createBrowseErrorMediaItem(
|
|
352
|
+
audioBrowser.resolveFormattedError(navigationErrorFor(e), parentId)
|
|
353
|
+
)
|
|
354
|
+
),
|
|
355
|
+
params,
|
|
356
|
+
)
|
|
368
357
|
}
|
|
369
358
|
}
|
|
370
359
|
}
|
|
@@ -375,8 +364,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
375
364
|
* Media3 transiently attaches the error code/message to the platform session's playback state
|
|
376
365
|
* without entering STATE_ERROR.
|
|
377
366
|
*
|
|
378
|
-
* NOTE: current Android Auto renders
|
|
379
|
-
*
|
|
367
|
+
* NOTE: current Android Auto renders nothing for this — its transient state is cleared
|
|
368
|
+
* microseconds after being set (see [createErrorMediaItem], androidx/media#2901). It is kept
|
|
380
369
|
* because it is the correct Media3-API error signal, costs nothing, and becomes user-visible if
|
|
381
370
|
* Android Auto moves to consuming SessionError via the Media3 controller API.
|
|
382
371
|
*
|
|
@@ -398,19 +387,45 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
398
387
|
}
|
|
399
388
|
|
|
400
389
|
/**
|
|
401
|
-
*
|
|
402
|
-
*
|
|
403
|
-
*
|
|
404
|
-
*
|
|
390
|
+
* Flattens a page's sections to MediaItems for browse delivery — the Media3 boundary where
|
|
391
|
+
* sections die (ADR 0010): the MediaBrowser protocol has no section node, so each child is
|
|
392
|
+
* stamped with its owning section's title/style hints. A section with a `path` gains a browsable
|
|
393
|
+
* "view more" row under the same header — at every `display`, because no Android Auto header is
|
|
394
|
+
* tappable at any of them, so the row is the section's only "view all" affordance here. Http(s)
|
|
395
|
+
* artwork routes through the content:// provider so Android Auto can load it via the
|
|
396
|
+
* ArtworkContentProvider.
|
|
405
397
|
*/
|
|
406
|
-
private fun toMediaItems(
|
|
398
|
+
private suspend fun toMediaItems(sections: List<Section>): List<MediaItem> {
|
|
407
399
|
val registry = player.browseArtworkRegistry
|
|
408
400
|
val authority = com.audiobrowser.util.ArtworkUris.authorityFor(player.context.packageName)
|
|
409
|
-
return
|
|
410
|
-
|
|
401
|
+
return sections.flatMap { section ->
|
|
402
|
+
// Android Auto has no disabled affordance, so an unavailable track hides
|
|
403
|
+
// — never a normal-looking dead row (Track.disabled's rendering ladder).
|
|
404
|
+
val children = section.children.filter { it.disabled != true }
|
|
405
|
+
val items = children.map { TrackFactory.toBrowseMediaItem(it, registry, authority, section) }
|
|
406
|
+
// No "view more" under an empty section — CarPlay skips empty sections
|
|
407
|
+
// outright, and a lone navigation tile under a header is a dead end.
|
|
408
|
+
if (section.path == null || children.isEmpty()) return@flatMap items
|
|
409
|
+
// The browser is already up at every call site, so awaiting it here is a field read, and
|
|
410
|
+
// viewMoreTitle is memoized per content generation — both are free after the first row.
|
|
411
|
+
val title = player.awaitBrowser().browserManager.viewMoreTitle()
|
|
412
|
+
items +
|
|
413
|
+
TrackFactory.toBrowseMediaItem(
|
|
414
|
+
TrackFactory.navigationTrack(section, title),
|
|
415
|
+
registry,
|
|
416
|
+
authority,
|
|
417
|
+
section,
|
|
418
|
+
)
|
|
411
419
|
}
|
|
412
420
|
}
|
|
413
421
|
|
|
422
|
+
/**
|
|
423
|
+
* Flat lists (tabs, search results) convert as one untitled list section — which contributes no
|
|
424
|
+
* group or style hints — so exactly one Track→MediaItem path exists at the Media3 boundary.
|
|
425
|
+
*/
|
|
426
|
+
private suspend fun toFlatMediaItems(tracks: List<Track>): List<MediaItem> =
|
|
427
|
+
toMediaItems(listOf(untitledSection(tracks.toTypedArray())))
|
|
428
|
+
|
|
414
429
|
override fun onGetItem(
|
|
415
430
|
session: MediaLibraryService.MediaLibrarySession,
|
|
416
431
|
browser: MediaSession.ControllerInfo,
|
|
@@ -418,15 +433,56 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
418
433
|
): ListenableFuture<LibraryResult<MediaItem>> {
|
|
419
434
|
Timber.Forest.d("onGetItem: ${browser.packageName}, mediaId = $mediaId")
|
|
420
435
|
return scope.future {
|
|
421
|
-
//
|
|
436
|
+
// Only the root answers ahead of awaitBrowser: it needs no browser. Every tile sentinel
|
|
437
|
+
// below does — for the formatter hop, and the gate one for gateDecision.
|
|
438
|
+
if (mediaId == BrowserPathHelper.ROOT_PATH) {
|
|
439
|
+
return@future LibraryResult.ofItem(
|
|
440
|
+
MediaItem.Builder()
|
|
441
|
+
.setMediaId(mediaId)
|
|
442
|
+
.setMediaMetadata(
|
|
443
|
+
MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
|
|
444
|
+
)
|
|
445
|
+
.build(),
|
|
446
|
+
null,
|
|
447
|
+
)
|
|
448
|
+
}
|
|
449
|
+
|
|
422
450
|
if (mediaId == BrowserPathHelper.OFFLINE_PATH) {
|
|
423
|
-
return@future LibraryResult.ofItem(
|
|
451
|
+
return@future LibraryResult.ofItem(
|
|
452
|
+
createOfflineMediaItem(
|
|
453
|
+
player
|
|
454
|
+
.awaitBrowser()
|
|
455
|
+
.resolveFormattedError(offlineError(), BrowserPathHelper.OFFLINE_PATH)
|
|
456
|
+
),
|
|
457
|
+
null,
|
|
458
|
+
)
|
|
424
459
|
}
|
|
425
460
|
|
|
426
|
-
// Return the error tile as a non-browsable item so tapping it can't re-browse into a
|
|
427
|
-
// failing path (which would push another error page onto the stack).
|
|
428
461
|
if (mediaId == BrowserPathHelper.ERROR_PATH) {
|
|
429
|
-
|
|
462
|
+
// The exception that produced the tile is gone by now — the sentinel is all the controller
|
|
463
|
+
// hands back — so the copy formats for the sentinel under the generic failure code.
|
|
464
|
+
return@future LibraryResult.ofItem(
|
|
465
|
+
createBrowseErrorMediaItem(
|
|
466
|
+
player
|
|
467
|
+
.awaitBrowser()
|
|
468
|
+
.resolveFormattedError(browseFailureError(), BrowserPathHelper.ERROR_PATH)
|
|
469
|
+
),
|
|
470
|
+
null,
|
|
471
|
+
)
|
|
472
|
+
}
|
|
473
|
+
|
|
474
|
+
if (mediaId == BrowserPathHelper.EMPTY_PATH) {
|
|
475
|
+
// A controller re-reading the tile it was served. The page's path is gone by now — the
|
|
476
|
+
// sentinel is all it hands back — so the copy formats for the sentinel and lands on the
|
|
477
|
+
// app's generic empty wording, or the default.
|
|
478
|
+
return@future LibraryResult.ofItem(
|
|
479
|
+
createEmptyMediaItem(
|
|
480
|
+
player
|
|
481
|
+
.awaitBrowser()
|
|
482
|
+
.resolveFormattedError(emptyContentError(), BrowserPathHelper.EMPTY_PATH)
|
|
483
|
+
),
|
|
484
|
+
null,
|
|
485
|
+
)
|
|
430
486
|
}
|
|
431
487
|
|
|
432
488
|
if (mediaId == BrowserPathHelper.GATE_PATH) {
|
|
@@ -447,22 +503,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
447
503
|
return@future LibraryResult.ofItem(createGateMediaItem(outcome.chrome!!), null)
|
|
448
504
|
}
|
|
449
505
|
|
|
450
|
-
if (mediaId == BrowserPathHelper.ROOT_PATH || mediaId == BrowserPathHelper.RECENT_PATH) {
|
|
451
|
-
return@future LibraryResult.ofItem(
|
|
452
|
-
MediaItem.Builder()
|
|
453
|
-
.setMediaId(mediaId)
|
|
454
|
-
.setMediaMetadata(
|
|
455
|
-
MediaMetadata.Builder().setIsBrowsable(true).setIsPlayable(false).build()
|
|
456
|
-
)
|
|
457
|
-
.build(),
|
|
458
|
-
null,
|
|
459
|
-
)
|
|
460
|
-
}
|
|
461
|
-
|
|
462
|
-
// Wait for browser to be registered if it's not available yet
|
|
463
506
|
val browserManager = player.awaitBrowser().browserManager
|
|
464
507
|
|
|
465
|
-
// Serve tracks from the track cache first (keyed by
|
|
508
|
+
// Serve tracks from the track cache first (keyed by path and src). Besides avoiding an HTTP
|
|
466
509
|
// resolve, this keeps item identity correct for contextual mediaIds: resolve() strips
|
|
467
510
|
// __trackId and would return the *parent container's* metadata as the item.
|
|
468
511
|
val browseAuthority =
|
|
@@ -534,9 +577,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
534
577
|
}
|
|
535
578
|
|
|
536
579
|
/**
|
|
537
|
-
* Notifies all subscribed controllers to refresh their content. Called internally when network
|
|
538
|
-
* state changes to refresh all subscribed paths.
|
|
539
|
-
*
|
|
540
580
|
* Safe to call from any thread: snapshots the subscribed paths and dispatches the session calls
|
|
541
581
|
* to the main (Media3 application) thread.
|
|
542
582
|
*/
|
|
@@ -549,10 +589,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
549
589
|
}
|
|
550
590
|
|
|
551
591
|
/**
|
|
552
|
-
* Notifies external controllers that content at the given path has changed
|
|
553
|
-
* subscribed to
|
|
554
|
-
*
|
|
555
|
-
* @param path The path where content has changed
|
|
592
|
+
* Notifies external controllers that content at the given path has changed, so controllers
|
|
593
|
+
* subscribed to it refresh their UI. Safe to call from any thread.
|
|
556
594
|
*/
|
|
557
595
|
fun notifyContentChanged(path: String) {
|
|
558
596
|
Timber.d("Notifying content changed for path: $path")
|
|
@@ -570,10 +608,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
570
608
|
notifySubscribedChildrenChanged()
|
|
571
609
|
}
|
|
572
610
|
|
|
573
|
-
/**
|
|
574
|
-
* Called when the browser becomes available after a cold start. Notifies all subscribed
|
|
575
|
-
* controllers to refresh their content.
|
|
576
|
-
*/
|
|
577
611
|
fun notifyBrowserReady() {
|
|
578
612
|
Timber.d("Browser ready - notifying all subscribed paths")
|
|
579
613
|
notifySubscribedChildrenChanged()
|
|
@@ -592,8 +626,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
592
626
|
): ListenableFuture<LibraryResult<Void>> {
|
|
593
627
|
Timber.d("onSearch: ${browser.packageName}, query = $query")
|
|
594
628
|
return scope.future {
|
|
595
|
-
// Wait for browser registration like onGetChildren does, so a cold-start voice search
|
|
596
|
-
// doesn't fail before JS has configured the browser.
|
|
597
629
|
val audioBrowser =
|
|
598
630
|
try {
|
|
599
631
|
player.awaitBrowser()
|
|
@@ -615,28 +647,83 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
615
647
|
return@future LibraryResult.ofVoid()
|
|
616
648
|
}
|
|
617
649
|
|
|
618
|
-
//
|
|
650
|
+
// Before the offline branch inside announceSearch: with no search source configured the
|
|
651
|
+
// answer is not-supported, online or not.
|
|
619
652
|
if (!browserManager.config.hasSearch) {
|
|
620
653
|
Timber.w("Search requested but no search source configured")
|
|
621
654
|
return@future LibraryResult.ofError(SessionError.ERROR_NOT_SUPPORTED)
|
|
622
655
|
}
|
|
623
656
|
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
Timber.d("Search completed: $resultCount results for query '$query'")
|
|
657
|
+
announceSearch(session, browser, browserManager, query, params)
|
|
658
|
+
LibraryResult.ofVoid()
|
|
659
|
+
}
|
|
660
|
+
}
|
|
630
661
|
|
|
631
|
-
|
|
632
|
-
|
|
662
|
+
/**
|
|
663
|
+
* Runs [query] and tells [browser] how many items [onGetSearchResult] will serve for it: the
|
|
664
|
+
* search's own hits, or the single tile standing in for them — a controller told zero never asks
|
|
665
|
+
* for items. Offline keeps the query for [reannounceOfflineSearches]; every other outcome drops
|
|
666
|
+
* it, so one controller holds at most its latest unanswered search.
|
|
667
|
+
*/
|
|
668
|
+
private suspend fun announceSearch(
|
|
669
|
+
session: MediaLibraryService.MediaLibrarySession,
|
|
670
|
+
browser: MediaSession.ControllerInfo,
|
|
671
|
+
browserManager: BrowserManager,
|
|
672
|
+
query: String,
|
|
673
|
+
params: MediaLibraryService.LibraryParams?,
|
|
674
|
+
) {
|
|
675
|
+
if (
|
|
676
|
+
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
677
|
+
) {
|
|
678
|
+
Timber.w("Network offline - announcing the offline tile for query: $query")
|
|
679
|
+
offlineSearches.record(browser, query, params)
|
|
680
|
+
session.notifySearchResultChanged(browser, query, 1, params)
|
|
681
|
+
return
|
|
682
|
+
}
|
|
683
|
+
offlineSearches.forget(browser)
|
|
684
|
+
|
|
685
|
+
try {
|
|
686
|
+
// Caches the result set under the query, which onGetSearchResult reads back through
|
|
687
|
+
// getCachedSearchResults.
|
|
688
|
+
val searchResults = browserManager.search(query)
|
|
689
|
+
failedSearch.clear()
|
|
690
|
+
val resultCount = announcedSearchCount(searchResults.normalizedSections)
|
|
691
|
+
|
|
692
|
+
Timber.d("Search announced $resultCount item(s) for query '$query'")
|
|
693
|
+
|
|
694
|
+
session.notifySearchResultChanged(browser, query, resultCount, params)
|
|
695
|
+
} catch (e: Exception) {
|
|
696
|
+
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
697
|
+
Timber.e(e, "Error during search for query: $query")
|
|
698
|
+
// A failed search announces its one item — the browse-error tile onGetSearchResult
|
|
699
|
+
// serves — rather than an ofError the browse list renders as nothing at all. Without
|
|
700
|
+
// the slot the failure is indistinguishable from an empty page by the time that call
|
|
701
|
+
// arrives, and a server error would read as the app's "no results" copy.
|
|
702
|
+
failedSearch.record(query, navigationErrorFor(e))
|
|
703
|
+
session.notifySearchResultChanged(browser, query, 1, params)
|
|
704
|
+
}
|
|
705
|
+
}
|
|
633
706
|
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
707
|
+
/**
|
|
708
|
+
* Re-runs every search that was served the offline tile, now that the network is back. Announcing
|
|
709
|
+
* what the fresh search found — rather than a bare "one item" — keeps the announced count equal
|
|
710
|
+
* to what [onGetSearchResult] will then serve from the cache this fills.
|
|
711
|
+
*/
|
|
712
|
+
private suspend fun reannounceOfflineSearches() {
|
|
713
|
+
val pending = offlineSearches.drain()
|
|
714
|
+
if (pending.isEmpty()) return
|
|
715
|
+
val session = mediaLibrarySession ?: return
|
|
716
|
+
val browserManager =
|
|
717
|
+
try {
|
|
718
|
+
player.awaitBrowser().browserManager
|
|
719
|
+
} catch (e: TimeoutCancellationException) {
|
|
720
|
+
Timber.w("Timed out waiting for browser - offline searches not re-announced")
|
|
721
|
+
return
|
|
639
722
|
}
|
|
723
|
+
|
|
724
|
+
pending.forEach { search ->
|
|
725
|
+
Timber.d("Network back - re-running search: ${search.query}")
|
|
726
|
+
announceSearch(session, search.browser, browserManager, search.query, search.params)
|
|
640
727
|
}
|
|
641
728
|
}
|
|
642
729
|
|
|
@@ -674,26 +761,57 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
674
761
|
)
|
|
675
762
|
}
|
|
676
763
|
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
764
|
+
// Checked before the failure slot, as in onGetChildren: a search that never reached the
|
|
765
|
+
// network is not a server failure, and connectivity returning is what fixes it.
|
|
766
|
+
if (
|
|
767
|
+
!player.networkMonitor.isOnline.value && browserManager.config.androidControllerOfflineError
|
|
768
|
+
) {
|
|
769
|
+
Timber.w("Network offline - returning the offline tile for query: $query")
|
|
770
|
+
sendBrowseError(session, browser, offline = true)
|
|
771
|
+
return@future LibraryResult.ofItemList(
|
|
772
|
+
ImmutableList.of(
|
|
773
|
+
createOfflineMediaItem(
|
|
774
|
+
audioBrowser.resolveFormattedError(
|
|
775
|
+
offlineError(),
|
|
776
|
+
BrowserPathHelper.createSearchPath(query),
|
|
777
|
+
)
|
|
778
|
+
)
|
|
779
|
+
),
|
|
780
|
+
params,
|
|
781
|
+
)
|
|
782
|
+
}
|
|
688
783
|
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
784
|
+
// The search itself failed, so this is a failure, not an empty page — same tile and same
|
|
785
|
+
// SessionError the browse catch sends, worded for the error its exception mapped to.
|
|
786
|
+
failedSearch.errorFor(query)?.let { error ->
|
|
787
|
+
sendBrowseError(session, browser, offline = false)
|
|
788
|
+
return@future LibraryResult.ofItemList(
|
|
789
|
+
ImmutableList.of(
|
|
790
|
+
createBrowseErrorMediaItem(
|
|
791
|
+
audioBrowser.resolveFormattedError(error, BrowserPathHelper.createSearchPath(query))
|
|
792
|
+
)
|
|
793
|
+
),
|
|
794
|
+
params,
|
|
795
|
+
)
|
|
796
|
+
}
|
|
797
|
+
|
|
798
|
+
try {
|
|
799
|
+
val tracks = browserManager.getCachedSearchResults(query)
|
|
800
|
+
if (tracks == null) Timber.w("No cached search results for query: $query")
|
|
801
|
+
// A search with nothing servable — no hits, every hit disabled, or nothing cached under
|
|
802
|
+
// this query — serves the app's copy for the search path instead of the car's bare "No
|
|
803
|
+
// items" (ADR 0001). Something must always come back: onSearch announced one item.
|
|
804
|
+
val mediaItems =
|
|
805
|
+
browseLevelItems(toFlatMediaItems(tracks?.toList().orEmpty())) {
|
|
806
|
+
audioBrowser.resolveFormattedError(
|
|
807
|
+
emptyContentError(),
|
|
808
|
+
BrowserPathHelper.createSearchPath(query),
|
|
809
|
+
)
|
|
696
810
|
}
|
|
811
|
+
|
|
812
|
+
val paginatedItems = mediaItems.paginate(page, pageSize)
|
|
813
|
+
Timber.d("Returning ${paginatedItems.size} search results")
|
|
814
|
+
LibraryResult.ofItemList(ImmutableList.copyOf(paginatedItems), params)
|
|
697
815
|
} catch (e: Exception) {
|
|
698
816
|
if (e is CancellationException && e !is TimeoutCancellationException) throw e
|
|
699
817
|
Timber.e(e, "Error getting search results for query: $query")
|
|
@@ -722,8 +840,9 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
722
840
|
return scope.future {
|
|
723
841
|
val audioBrowser = player.awaitBrowser()
|
|
724
842
|
|
|
725
|
-
//
|
|
726
|
-
//
|
|
843
|
+
// The "leave playback alone" answer for handleTrackLoad: returning the current state
|
|
844
|
+
// unchanged is how Media3 is told to do nothing. ExoPlayer is main-thread confined and this
|
|
845
|
+
// future runs on IO, so the reads hop to Main.
|
|
727
846
|
suspend fun currentPlayerState(): MediaSession.MediaItemsWithStartPosition =
|
|
728
847
|
withContext(Dispatchers.Main) {
|
|
729
848
|
val currentItems = player.tracks.map { TrackFactory.toMedia3(it) }
|
|
@@ -733,26 +852,26 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
733
852
|
|
|
734
853
|
val browserManager = audioBrowser.browserManager
|
|
735
854
|
|
|
736
|
-
// A single tapped item resolves to the contextual
|
|
855
|
+
// A single tapped item resolves to the contextual path of the list it was
|
|
737
856
|
// tapped in: directly for contextual mediaIds, via the track cache for
|
|
738
|
-
// stable-id mediaIds (see BrowserManager.
|
|
857
|
+
// stable-id mediaIds (see BrowserManager.contextualPathFor). A search
|
|
739
858
|
// selection is not a list tap — its queue comes from the search results
|
|
740
859
|
// (resolveMediaItemsForPlayback), never from a browsed container.
|
|
741
|
-
val
|
|
860
|
+
val singleContextualPath =
|
|
742
861
|
mediaItems
|
|
743
862
|
.singleOrNull()
|
|
744
863
|
?.takeIf { it.requestMetadata.searchQuery == null }
|
|
745
|
-
?.let { browserManager.
|
|
864
|
+
?.let { browserManager.contextualPathFor(it.mediaId) }
|
|
746
865
|
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
val
|
|
750
|
-
val trackId = BrowserPathHelper.extractTrackId(singleContextualUrl)
|
|
866
|
+
if (singleContextualPath != null) {
|
|
867
|
+
val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
|
|
868
|
+
val trackId = BrowserPathHelper.extractTrackId(singleContextualPath)
|
|
751
869
|
|
|
752
|
-
//
|
|
870
|
+
// A tap inside the queue's own source list skips rather than rebuilds (exact path first,
|
|
871
|
+
// identity for index-less paths — see indexOfTappedTrack).
|
|
753
872
|
if (trackId != null && parentPath == player.queueSourcePath) {
|
|
754
873
|
val queueTracks = withContext(Dispatchers.Main) { player.tracks }
|
|
755
|
-
val index = queueTracks.
|
|
874
|
+
val index = queueTracks.indexOfTappedTrack(singleContextualPath, trackId)
|
|
756
875
|
if (index >= 0) {
|
|
757
876
|
Timber.d("Queue already from $parentPath, skipping to index $index")
|
|
758
877
|
val track = queueTracks[index]
|
|
@@ -763,7 +882,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
763
882
|
index.toDouble(),
|
|
764
883
|
::currentPlayerState,
|
|
765
884
|
) {
|
|
766
|
-
// Return the existing queue items with the new start index
|
|
767
885
|
val existingItems = queueTracks.map { TrackFactory.toMedia3(it) }
|
|
768
886
|
MediaSession.MediaItemsWithStartPosition(existingItems, index, startPositionMs)
|
|
769
887
|
}
|
|
@@ -784,9 +902,10 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
784
902
|
result.startIndex.toDouble(),
|
|
785
903
|
::currentPlayerState,
|
|
786
904
|
) {
|
|
787
|
-
//
|
|
788
|
-
|
|
789
|
-
|
|
905
|
+
// Inside handleTrackLoad's default branch: a consumer that handles the load itself owns
|
|
906
|
+
// the queue, so queueSourcePath must not claim this path on its behalf.
|
|
907
|
+
if (singleContextualPath != null) {
|
|
908
|
+
val parentPath = BrowserPathHelper.stripTrackId(singleContextualPath)
|
|
790
909
|
withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
|
|
791
910
|
}
|
|
792
911
|
result
|
|
@@ -802,8 +921,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
802
921
|
* using the browse callback. This enables seamless resumption after app restart with the same
|
|
803
922
|
* player settings (repeat mode, shuffle, playback speed).
|
|
804
923
|
*
|
|
805
|
-
* @param mediaSession The media session
|
|
806
|
-
* @param controller The controller requesting resumption
|
|
807
924
|
* @param isForPlayback True if this should start playback; false if just gathering info for the
|
|
808
925
|
* boot-time resumption notification (no network; local metadata only).
|
|
809
926
|
* @see https://developer.android.com/media/media3/session/background-playback#resumption
|
|
@@ -812,6 +929,25 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
812
929
|
mediaSession: MediaSession,
|
|
813
930
|
controller: MediaSession.ControllerInfo,
|
|
814
931
|
isForPlayback: Boolean,
|
|
932
|
+
): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
|
|
933
|
+
val resumption = resume(controller, isForPlayback)
|
|
934
|
+
if (isForPlayback) {
|
|
935
|
+
Futures.addCallback(
|
|
936
|
+
resumption,
|
|
937
|
+
object : FutureCallback<MediaSession.MediaItemsWithStartPosition> {
|
|
938
|
+
override fun onSuccess(result: MediaSession.MediaItemsWithStartPosition) {}
|
|
939
|
+
|
|
940
|
+
override fun onFailure(t: Throwable) = player.onPlaybackResumptionFailed()
|
|
941
|
+
},
|
|
942
|
+
ContextCompat.getMainExecutor(player.context),
|
|
943
|
+
)
|
|
944
|
+
}
|
|
945
|
+
return resumption
|
|
946
|
+
}
|
|
947
|
+
|
|
948
|
+
private fun resume(
|
|
949
|
+
controller: MediaSession.ControllerInfo,
|
|
950
|
+
isForPlayback: Boolean,
|
|
815
951
|
): ListenableFuture<MediaSession.MediaItemsWithStartPosition> {
|
|
816
952
|
Timber.d("${controller.packageName}")
|
|
817
953
|
|
|
@@ -825,9 +961,17 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
825
961
|
throw IllegalStateException("No playback state to resume")
|
|
826
962
|
}
|
|
827
963
|
|
|
828
|
-
//
|
|
829
|
-
//
|
|
830
|
-
//
|
|
964
|
+
// The persisted track can carry `disabled` — it became unavailable after
|
|
965
|
+
// it was saved. A disabled track never plays, resumption included
|
|
966
|
+
// (Track.disabled); failing the future refuses without touching the
|
|
967
|
+
// player.
|
|
968
|
+
if (state.track.disabled == true) {
|
|
969
|
+
Timber.w("Refusing resumption of disabled track: ${state.track.title}")
|
|
970
|
+
throw IllegalStateException("Persisted track is disabled")
|
|
971
|
+
}
|
|
972
|
+
|
|
973
|
+
// Info-gathering returns before the settings restore and the queue expansion below: both
|
|
974
|
+
// touch the live player or the network, and neither is permitted here.
|
|
831
975
|
if (!isForPlayback) {
|
|
832
976
|
Timber.d("Info-gathering resumption (boot-time); returning stored track without expansion")
|
|
833
977
|
return@future MediaSession.MediaItemsWithStartPosition(
|
|
@@ -840,14 +984,12 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
840
984
|
// restore() sets player properties which must happen on main thread
|
|
841
985
|
withContext(Dispatchers.Main) { player.playbackStateStore.restore() }
|
|
842
986
|
|
|
843
|
-
val
|
|
844
|
-
Timber.d("Resuming from
|
|
987
|
+
val path = state.track.path
|
|
988
|
+
Timber.d("Resuming from path=$path, positionMs=${state.positionMs}")
|
|
845
989
|
|
|
846
|
-
// Wait for browser to be available (JS needs to have configured it)
|
|
847
990
|
val browserManager = player.awaitBrowser().browserManager
|
|
848
991
|
|
|
849
|
-
|
|
850
|
-
val expanded = url?.let { browserManager.expandQueueFromContextualUrl(it) }
|
|
992
|
+
val expanded = path?.let { browserManager.expandQueueFromContextualPath(it) }
|
|
851
993
|
|
|
852
994
|
if (expanded != null) {
|
|
853
995
|
val (tracks, selectedIndex) = expanded
|
|
@@ -855,9 +997,8 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
855
997
|
"Restored ${tracks.size} tracks, starting at index $selectedIndex at ${state.positionMs}ms"
|
|
856
998
|
)
|
|
857
999
|
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
val parentPath = BrowserPathHelper.stripTrackId(url)
|
|
1000
|
+
if (BrowserPathHelper.isContextual(path)) {
|
|
1001
|
+
val parentPath = BrowserPathHelper.stripTrackId(path)
|
|
861
1002
|
withContext(Dispatchers.Main) { player.queueSourcePath = parentPath }
|
|
862
1003
|
}
|
|
863
1004
|
|
|
@@ -867,7 +1008,6 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
867
1008
|
state.positionMs,
|
|
868
1009
|
)
|
|
869
1010
|
} else {
|
|
870
|
-
// Fallback: play just the stored track
|
|
871
1011
|
Timber.d("Queue expansion failed, using stored track: ${state.track.title}")
|
|
872
1012
|
MediaSession.MediaItemsWithStartPosition(
|
|
873
1013
|
ImmutableList.of(TrackFactory.toMedia3(state.track)),
|
|
@@ -878,3 +1018,163 @@ class MediaSessionCallback(private val player: Player) :
|
|
|
878
1018
|
}
|
|
879
1019
|
}
|
|
880
1020
|
}
|
|
1021
|
+
|
|
1022
|
+
/**
|
|
1023
|
+
* Builds a non-browsable, non-playable [MediaItem] used to surface an error inside an Android Auto
|
|
1024
|
+
* / AAOS browse list. Rendered as a greyed-out, non-interactive tile, which is the only
|
|
1025
|
+
* side-effect-free way to communicate a browse failure to legacy controllers (Media3 drops
|
|
1026
|
+
* [LibraryResult.ofError] on the legacy browse bridge, leaving an empty "No items" screen).
|
|
1027
|
+
*
|
|
1028
|
+
* Tiles are the only in-browse error signal that exists. Verified on a head unit (2026-06): the
|
|
1029
|
+
* Android Auto browse list renders no error text for a transient [SessionError], for sticky
|
|
1030
|
+
* non-fatal replication, or for fatal replication (setLibraryErrorReplicationMode). Fatal
|
|
1031
|
+
* replication does surface the message on the playback screen, but at the cost of presenting the
|
|
1032
|
+
* session as STATE_ERROR with no actions, hiding the now-playing item and transport controls.
|
|
1033
|
+
*/
|
|
1034
|
+
internal fun createErrorMediaItem(mediaId: String, title: String, subtitle: String): MediaItem =
|
|
1035
|
+
MediaItem.Builder()
|
|
1036
|
+
.setMediaId(mediaId)
|
|
1037
|
+
.setMediaMetadata(
|
|
1038
|
+
MediaMetadata.Builder()
|
|
1039
|
+
.setTitle(title)
|
|
1040
|
+
.setSubtitle(subtitle)
|
|
1041
|
+
// Android Auto ignores these flags and drills into a tapped tile anyway; onGetChildren
|
|
1042
|
+
// returns an empty list for the sentinel paths, so it dead-ends at "No Items" rather
|
|
1043
|
+
// than stacking error pages.
|
|
1044
|
+
.setIsBrowsable(false)
|
|
1045
|
+
.setIsPlayable(false)
|
|
1046
|
+
.build()
|
|
1047
|
+
)
|
|
1048
|
+
.build()
|
|
1049
|
+
|
|
1050
|
+
/**
|
|
1051
|
+
* The formatted form every tile is built from: the message renders as the subtitle, with newlines
|
|
1052
|
+
* collapsed to spaces — list rows are single-line.
|
|
1053
|
+
*/
|
|
1054
|
+
private fun createErrorMediaItem(mediaId: String, formatted: FormattedNavigationError): MediaItem =
|
|
1055
|
+
createErrorMediaItem(
|
|
1056
|
+
mediaId = mediaId,
|
|
1057
|
+
title = formatted.title,
|
|
1058
|
+
subtitle = formatted.message?.replace('\n', ' ') ?: "",
|
|
1059
|
+
)
|
|
1060
|
+
|
|
1061
|
+
/**
|
|
1062
|
+
* Builds the empty tile from the app's formatted `empty-content` copy for the page's path, so an
|
|
1063
|
+
* empty Favorites tab and an empty search can be worded apart (ADR 0001). Same shape as the error
|
|
1064
|
+
* tiles — non-browsable, non-playable — and deliberately NOT accompanied by a SessionError: an
|
|
1065
|
+
* empty page is a successful resolve.
|
|
1066
|
+
*/
|
|
1067
|
+
internal fun createEmptyMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1068
|
+
createErrorMediaItem(BrowserPathHelper.EMPTY_PATH, formatted)
|
|
1069
|
+
|
|
1070
|
+
/**
|
|
1071
|
+
* Builds the offline tile from the app's formatted `network-error` copy for the path being served,
|
|
1072
|
+
* so one browse list never mixes the app's locale with the device's.
|
|
1073
|
+
*/
|
|
1074
|
+
internal fun createOfflineMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1075
|
+
createErrorMediaItem(BrowserPathHelper.OFFLINE_PATH, formatted)
|
|
1076
|
+
|
|
1077
|
+
/**
|
|
1078
|
+
* Builds the tile a failed browse or search serves, from the formatted copy for the error the
|
|
1079
|
+
* request's exception mapped to. The true offline case is handled separately by the networkMonitor
|
|
1080
|
+
* guards; anything reaching a catch block is an online-but-failed request (e.g. server down, bad
|
|
1081
|
+
* status), so it must NOT be labelled "no internet connection".
|
|
1082
|
+
*/
|
|
1083
|
+
internal fun createBrowseErrorMediaItem(formatted: FormattedNavigationError): MediaItem =
|
|
1084
|
+
createErrorMediaItem(BrowserPathHelper.ERROR_PATH, formatted)
|
|
1085
|
+
|
|
1086
|
+
/**
|
|
1087
|
+
* What a non-root browse level or a search serves: its own items, or the lone empty tile when it
|
|
1088
|
+
* came back with none. [formatted] is a JS hop, so it runs only when there is nothing to show. The
|
|
1089
|
+
* root is not served through here — an empty tab list is a different condition.
|
|
1090
|
+
*/
|
|
1091
|
+
internal suspend fun browseLevelItems(
|
|
1092
|
+
children: List<MediaItem>,
|
|
1093
|
+
formatted: suspend () -> FormattedNavigationError,
|
|
1094
|
+
): List<MediaItem> = children.ifEmpty { listOf(createEmptyMediaItem(formatted())) }
|
|
1095
|
+
|
|
1096
|
+
/** The navigation error an empty page raises: no message of its own, the path carries the copy. */
|
|
1097
|
+
internal fun emptyContentError(): NavigationError =
|
|
1098
|
+
NavigationError(NavigationErrorType.EMPTY_CONTENT, "", null, null)
|
|
1099
|
+
|
|
1100
|
+
/** The navigation error a browse or search served while offline raises. */
|
|
1101
|
+
internal fun offlineError(): NavigationError =
|
|
1102
|
+
NavigationError(NavigationErrorType.NETWORK_ERROR, "", null, null)
|
|
1103
|
+
|
|
1104
|
+
/** The failure a re-read of the browse-error tile stands on, its own exception long gone. */
|
|
1105
|
+
internal fun browseFailureError(): NavigationError =
|
|
1106
|
+
NavigationError(NavigationErrorType.UNKNOWN_ERROR, "", null, null)
|
|
1107
|
+
|
|
1108
|
+
/**
|
|
1109
|
+
* The item count [MediaSessionCallback.onSearch] announces for a search that ran. Disabled tracks
|
|
1110
|
+
* hide on Android Auto (Track.disabled), so they never inflate it; and a search with nothing
|
|
1111
|
+
* servable announces one — the empty tile [MediaSessionCallback.onGetSearchResult] serves in their
|
|
1112
|
+
* place — because a controller told zero never asks for items. The gate and failure branches
|
|
1113
|
+
* announce their own single tile by the same rule.
|
|
1114
|
+
*/
|
|
1115
|
+
internal fun announcedSearchCount(sections: List<Section>?): Int =
|
|
1116
|
+
(sections?.sumOf { section -> section.children.count { it.disabled != true } } ?: 0)
|
|
1117
|
+
.coerceAtLeast(1)
|
|
1118
|
+
|
|
1119
|
+
/**
|
|
1120
|
+
* The search each controller was last served the offline tile for. Media3 addresses a search result
|
|
1121
|
+
* by (controller, query) and keeps no record of its own, and a search has no subscription the way a
|
|
1122
|
+
* browse level does — so without this the offline tile stays on screen until the user searches
|
|
1123
|
+
* again. Only an offline-served query is kept: a search that ran found what it found, and one that
|
|
1124
|
+
* failed did so with a network.
|
|
1125
|
+
*
|
|
1126
|
+
* Written from the callback's IO scope and read from the connectivity observer, so every accessor
|
|
1127
|
+
* is synchronized.
|
|
1128
|
+
*/
|
|
1129
|
+
internal class OfflineSearchRegistry {
|
|
1130
|
+
private val searches = mutableMapOf<MediaSession.ControllerInfo, OfflineSearch>()
|
|
1131
|
+
|
|
1132
|
+
@Synchronized
|
|
1133
|
+
fun record(
|
|
1134
|
+
browser: MediaSession.ControllerInfo,
|
|
1135
|
+
query: String,
|
|
1136
|
+
params: MediaLibraryService.LibraryParams?,
|
|
1137
|
+
) {
|
|
1138
|
+
searches[browser] = OfflineSearch(browser, query, params)
|
|
1139
|
+
}
|
|
1140
|
+
|
|
1141
|
+
@Synchronized
|
|
1142
|
+
fun forget(browser: MediaSession.ControllerInfo) {
|
|
1143
|
+
searches.remove(browser)
|
|
1144
|
+
}
|
|
1145
|
+
|
|
1146
|
+
/** Takes every record: a re-run that finds the network gone again records its own. */
|
|
1147
|
+
@Synchronized
|
|
1148
|
+
fun drain(): List<OfflineSearch> = searches.values.toList().also { searches.clear() }
|
|
1149
|
+
}
|
|
1150
|
+
|
|
1151
|
+
/** One controller's unanswered search: everything announcing it again needs. */
|
|
1152
|
+
internal data class OfflineSearch(
|
|
1153
|
+
val browser: MediaSession.ControllerInfo,
|
|
1154
|
+
val query: String,
|
|
1155
|
+
val params: MediaLibraryService.LibraryParams?,
|
|
1156
|
+
)
|
|
1157
|
+
|
|
1158
|
+
/**
|
|
1159
|
+
* Remembers the query whose search threw, so [MediaSessionCallback.onGetSearchResult] serves the
|
|
1160
|
+
* browse-error tile instead of the empty one — by then the failure is otherwise indistinguishable
|
|
1161
|
+
* from a page that found nothing. Written and read from the callback's IO scope.
|
|
1162
|
+
*
|
|
1163
|
+
* One slot, matching BrowserManager's single-entry result cache: two failures in a row leave only
|
|
1164
|
+
* the later query recorded, so a late fetch of the earlier one serves the empty tile instead of the
|
|
1165
|
+
* error tile. Acceptable while only the most recent search's results are retrievable at all.
|
|
1166
|
+
*/
|
|
1167
|
+
internal class FailedSearchSlot {
|
|
1168
|
+
@Volatile private var failed: Pair<String, NavigationError>? = null
|
|
1169
|
+
|
|
1170
|
+
fun record(query: String, error: NavigationError) {
|
|
1171
|
+
failed = query to error
|
|
1172
|
+
}
|
|
1173
|
+
|
|
1174
|
+
fun clear() {
|
|
1175
|
+
failed = null
|
|
1176
|
+
}
|
|
1177
|
+
|
|
1178
|
+
/** The error [query] failed with, or null when it is not the query that failed. */
|
|
1179
|
+
fun errorFor(query: String): NavigationError? = failed?.takeIf { it.first == query }?.second
|
|
1180
|
+
}
|