react-native-audio-browser 0.2.0-next.5 → 0.2.0-next.50
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 +37 -23
- package/android/build.gradle +43 -15
- package/android/gradle.properties +3 -3
- package/android/src/main/AndroidManifest.xml +3 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +550 -283
- 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/RemoteOutputs.kt +128 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +41 -11
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +23 -10
- 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 +1 -1
- 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 +639 -278
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +85 -33
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +88 -44
- 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 +180 -84
- 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 +16 -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/ArtworkRoutes.kt +39 -0
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +15 -0
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +61 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -1
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +24 -49
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +22 -1
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +2 -2
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +103 -67
- 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/LegacyRatingTest.kt +103 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +22 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +159 -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 +477 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +138 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +212 -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/PlayerInvalidTrackTest.kt +67 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +92 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +192 -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/player/StandardSkipTest.kt +151 -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/NetworkConnectivityMonitorTest.kt +99 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +95 -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/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +91 -1
- 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 +131 -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 +6 -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 +52 -0
- package/ios/Player/NowPlayingUpdater.swift +182 -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 +975 -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/ArtworkFreshnessTests.swift +67 -0
- 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 +66 -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/PlayerInvalidTrackTests.swift +65 -0
- package/ios/Tests/PlayerPolicyTests.swift +460 -0
- package/ios/Tests/{PlaybackCoordinatorTests.swift → PlayerTests.swift} +573 -395
- 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/ArtworkFreshness.swift +42 -0
- package/ios/Util/ArtworkImageFetcher.swift +143 -5
- 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 +4 -3
- package/lib/commonjs/features/output.js.map +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 +3 -19
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +5 -3
- 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 +4 -3
- package/lib/module/features/output.js.map +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 +2 -17
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +4 -2
- 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 +4 -3
- package/lib/typescript/src/features/output.d.ts.map +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 +24 -21
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +16 -1
- 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/specs/audio-browser.nitro.d.ts +3 -4
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
- package/lib/typescript/src/types/browser-native.d.ts +3 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +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 +0 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
- package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
- package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
- package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +4 -7
- package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
- package/nitrogen/generated/android/c++/JGate.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
- package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +68 -44
- 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 +19 -12
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
- package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
- package/nitrogen/generated/android/c++/JOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +5 -2
- package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
- package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +10 -10
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/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.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
- package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +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 +39 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +2 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/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_RemoteButtonLayout.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
- package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +767 -638
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +28 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +30 -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/NativeSetupPlayerOptions.swift +19 -1
- package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/OutputType.swift +4 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- 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 +12 -0
- package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
- package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
- package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +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++/NativeSetupPlayerOptions.hpp +6 -2
- package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/OutputType.hpp +5 -1
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- 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 +4 -3
- 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 +31 -40
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +27 -5
- 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 +9 -8
- package/src/style-resolution.test.ts +210 -0
- package/src/test-utils/reactNativeStub.ts +60 -0
- package/src/types/browser-native.ts +7 -3
- package/src/types/browser-nodes.ts +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 +158 -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++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -20,9 +20,11 @@ import com.audiobrowser.browser.CallbackException
|
|
|
20
20
|
import com.audiobrowser.browser.ContentNotFoundException
|
|
21
21
|
import com.audiobrowser.browser.HttpStatusException
|
|
22
22
|
import com.audiobrowser.browser.NetworkException
|
|
23
|
+
import com.audiobrowser.browser.flattenedChildren
|
|
23
24
|
import com.audiobrowser.browser.handleTrackLoad
|
|
24
25
|
import com.audiobrowser.browser.resolveMediaUrl
|
|
25
26
|
import com.audiobrowser.extension.NumberExt.Companion.toSeconds
|
|
27
|
+
import com.audiobrowser.extension.indexOfTappedTrack
|
|
26
28
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
27
29
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
28
30
|
import com.audiobrowser.player.Player
|
|
@@ -35,6 +37,7 @@ import com.audiobrowser.util.SystemVolumeMonitor
|
|
|
35
37
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
36
38
|
import com.google.common.util.concurrent.ListenableFuture
|
|
37
39
|
import com.margelo.nitro.NitroModules
|
|
40
|
+
import com.margelo.nitro.audiobrowser.ArtworkRequestConfig
|
|
38
41
|
import com.margelo.nitro.audiobrowser.BatteryOptimizationStatus
|
|
39
42
|
import com.margelo.nitro.audiobrowser.BatteryOptimizationStatusChangedEvent
|
|
40
43
|
import com.margelo.nitro.audiobrowser.BatteryWarningPendingChangedEvent
|
|
@@ -50,6 +53,7 @@ import com.margelo.nitro.audiobrowser.HybridAudioBrowserSpec
|
|
|
50
53
|
import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
51
54
|
import com.margelo.nitro.audiobrowser.NativeBrowserConfiguration
|
|
52
55
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
56
|
+
import com.margelo.nitro.audiobrowser.NativeRouteEntry
|
|
53
57
|
import com.margelo.nitro.audiobrowser.NativeSetupPlayerOptions
|
|
54
58
|
import com.margelo.nitro.audiobrowser.NativeUpdateOptions
|
|
55
59
|
import com.margelo.nitro.audiobrowser.NavigationError
|
|
@@ -82,31 +86,106 @@ import com.margelo.nitro.audiobrowser.SleepTimer
|
|
|
82
86
|
import com.margelo.nitro.audiobrowser.TimedMetadata
|
|
83
87
|
import com.margelo.nitro.audiobrowser.Track
|
|
84
88
|
import com.margelo.nitro.audiobrowser.TrackMetadata
|
|
89
|
+
import com.margelo.nitro.audiobrowser.TransformableRequestConfig
|
|
90
|
+
import com.margelo.nitro.core.NullType
|
|
85
91
|
import com.margelo.nitro.core.Promise
|
|
86
92
|
import java.util.concurrent.TimeUnit
|
|
93
|
+
import java.util.concurrent.atomic.AtomicReference
|
|
87
94
|
import kotlin.coroutines.resume
|
|
88
95
|
import kotlin.coroutines.resumeWithException
|
|
89
96
|
import kotlin.coroutines.suspendCoroutine
|
|
97
|
+
import kotlin.time.Duration.Companion.seconds
|
|
90
98
|
import kotlinx.coroutines.CancellationException
|
|
99
|
+
import kotlinx.coroutines.CoroutineScope
|
|
91
100
|
import kotlinx.coroutines.Job
|
|
92
101
|
import kotlinx.coroutines.MainScope
|
|
102
|
+
import kotlinx.coroutines.async
|
|
103
|
+
import kotlinx.coroutines.cancel
|
|
93
104
|
import kotlinx.coroutines.cancelChildren
|
|
94
|
-
import kotlinx.coroutines.delay
|
|
95
105
|
import kotlinx.coroutines.launch
|
|
96
106
|
import kotlinx.coroutines.runBlocking
|
|
107
|
+
import kotlinx.coroutines.withTimeoutOrNull
|
|
97
108
|
import timber.log.Timber
|
|
98
109
|
|
|
99
110
|
@Keep
|
|
100
111
|
@DoNotStrip
|
|
101
112
|
class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
102
113
|
|
|
103
|
-
/**
|
|
114
|
+
/**
|
|
115
|
+
* Nitro calls this only when JS calls `dispose()` explicitly — never on runtime teardown, which
|
|
116
|
+
* is what [AudioBrowserLifecycleModule] is for. Both routes land here.
|
|
117
|
+
*
|
|
118
|
+
* The Service outlives this object, so everything registered in `init` or on connect has to be
|
|
119
|
+
* undone. Left alone, the running [Player] goes on invoking callbacks into a dead JSI runtime,
|
|
120
|
+
* and every reload strands another ServiceConnection and lifecycle observer, each retaining a
|
|
121
|
+
* BrowserManager.
|
|
122
|
+
*
|
|
123
|
+
* Runs the teardown on main: the state below is written from main-thread coroutines
|
|
124
|
+
* ([onServiceConnected], [onServiceDisconnected]), while dispose itself arrives on the JS thread
|
|
125
|
+
* or the teardown callback's thread.
|
|
126
|
+
*/
|
|
104
127
|
override fun dispose() {
|
|
128
|
+
current.compareAndSet(this, null)
|
|
105
129
|
systemVolumeMonitor.destroy()
|
|
106
130
|
outputMonitor.destroy()
|
|
131
|
+
// Only when still ours: on a reload the replacement may already own the slot.
|
|
132
|
+
carConnectionTarget.compareAndSet(onCarConnectedChanged, null)
|
|
133
|
+
|
|
134
|
+
// The runtime behind the config's JS functions is going away, but anything still holding
|
|
135
|
+
// this instance (an in-flight browse coroutine, the running player) can invoke them after
|
|
136
|
+
// it's gone — each invoke then throws instead of answering, so browse takes its error path
|
|
137
|
+
// rather than its fallback.
|
|
138
|
+
dropStaleJSCallbacks()
|
|
139
|
+
|
|
140
|
+
handler.post {
|
|
141
|
+
connectedService?.let { service ->
|
|
142
|
+
// Identity-guarded: both instances bind to the same singleton Service, so a late dispose
|
|
143
|
+
// must not strip the wiring a replacement has already installed.
|
|
144
|
+
if (service.player.getCallbacks() === callbacks) service.player.setCallbacks(null)
|
|
145
|
+
if (service.player.browser === this) {
|
|
146
|
+
service.player.browser = null
|
|
147
|
+
service.player.forgetBrowserRegistration()
|
|
148
|
+
// The formatter wraps a JS callback from this instance's runtime (installed by our
|
|
149
|
+
// setup(); browser still being ours means no replacement has run setup yet). Without
|
|
150
|
+
// this, every track change until the next setup() throws into the updater's fallback.
|
|
151
|
+
service.player.nowPlaying.formatter = null
|
|
152
|
+
}
|
|
153
|
+
if (service.onBatteryWarningPendingChanged === onBatteryWarningPending) {
|
|
154
|
+
service.onBatteryWarningPendingChanged = null
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
connectedService = null
|
|
158
|
+
|
|
159
|
+
// Dropping the reference disconnects nothing — the controller stays in the session's
|
|
160
|
+
// connected list, holding a binder and a listener.
|
|
161
|
+
mediaBrowserFuture?.let { MediaBrowser.releaseFuture(it) }
|
|
162
|
+
mediaBrowserFuture = null
|
|
163
|
+
setupPromise = null
|
|
164
|
+
|
|
165
|
+
serviceBinding.unbind(this)
|
|
166
|
+
|
|
167
|
+
ProcessLifecycleOwner.get().lifecycle.removeObserver(lifecycleObserver)
|
|
168
|
+
// After the observer removal, so this post is not the one dropped.
|
|
169
|
+
handler.removeCallbacksAndMessages(null)
|
|
170
|
+
mainScope.cancel()
|
|
171
|
+
}
|
|
107
172
|
super.dispose()
|
|
108
173
|
}
|
|
109
174
|
|
|
175
|
+
/**
|
|
176
|
+
* Demotes the config to data-only (deep strip of every JS function field) and reverts the JS
|
|
177
|
+
* callbacks stored outside the config tree ([resolveGate]; the now-playing formatter is cleared
|
|
178
|
+
* in [dispose]'s service block, identity-guarded). Stale paths then degrade the same way as a
|
|
179
|
+
* config that never had callbacks — static request/browse layers, default error copy, fail-closed
|
|
180
|
+
* gate — instead of throwing into the error path. Mirrors iOS `dropStaleJSCallbacks`, where the
|
|
181
|
+
* same invoke is fatal rather than a throw.
|
|
182
|
+
*/
|
|
183
|
+
private fun dropStaleJSCallbacks() {
|
|
184
|
+
_configuration = _configuration.strippingJSCallbacks()
|
|
185
|
+
browserManager.config = buildConfig()
|
|
186
|
+
resolveGate = defaultResolveGate
|
|
187
|
+
}
|
|
188
|
+
|
|
110
189
|
private val mainScope = MainScope()
|
|
111
190
|
private var navigationJob: Job? = null
|
|
112
191
|
private val handler = Handler(Looper.getMainLooper())
|
|
@@ -129,8 +208,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
129
208
|
singleTrack = null,
|
|
130
209
|
handleTrackLoad = null,
|
|
131
210
|
androidControllerOfflineError = null,
|
|
211
|
+
viewMoreTitle = null,
|
|
132
212
|
carPlayLoadingTitle = null,
|
|
133
|
-
|
|
213
|
+
resolveAlbumPath = null,
|
|
134
214
|
formatNavigationError = null,
|
|
135
215
|
)
|
|
136
216
|
|
|
@@ -149,7 +229,19 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
149
229
|
private var updateOptions: PlayerUpdateOptions = PlayerUpdateOptions()
|
|
150
230
|
private var mediaBrowserFuture: ListenableFuture<MediaBrowser>? = null
|
|
151
231
|
private var setupOptions = PlayerSetupOptions()
|
|
152
|
-
private var
|
|
232
|
+
private var remoteOutputs = false
|
|
233
|
+
// Written only on the main thread (ServiceConnection callbacks, dispose); read from main or,
|
|
234
|
+
// in a few places, straight from the JS thread. @Volatile gives those reads visibility — they
|
|
235
|
+
// must still tolerate staleness in both directions (a just-detached service, or null while
|
|
236
|
+
// onServiceConnected is pending). Keep writes on main; no read-modify-write.
|
|
237
|
+
@Volatile private var connectedService: Service? = null
|
|
238
|
+
|
|
239
|
+
private val serviceBinding = ServiceBinding(context)
|
|
240
|
+
|
|
241
|
+
/** Held rather than inlined so [dispose] can tell its own wiring from a replacement's. */
|
|
242
|
+
private val onBatteryWarningPending: (Boolean) -> Unit = { pending ->
|
|
243
|
+
post { onBatteryWarningPendingChanged(BatteryWarningPendingChangedEvent(pending)) }
|
|
244
|
+
}
|
|
153
245
|
private var setupPromise: ((Unit) -> Unit)? = null
|
|
154
246
|
|
|
155
247
|
// Initial player state staged before the player exists — from setup options or the imperative
|
|
@@ -168,14 +260,14 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
168
260
|
override var onFormattedNavigationError: (FormattedNavigationError?) -> Unit = {}
|
|
169
261
|
|
|
170
262
|
// MARK: Gate callbacks (native→JS; set from JS, native CALLS them)
|
|
171
|
-
// Default resolver: only reachable
|
|
172
|
-
//
|
|
263
|
+
// Default resolver: only reachable while hasResolver=true but no live runtime has the real
|
|
264
|
+
// `resolveGate` bound — the init window before JS assigns it, or after [dispose] reverts a dead
|
|
265
|
+
// runtime's resolver. It DENIES by default
|
|
173
266
|
// (gated=true) so an active gate never serves content during that window — same fail-closed
|
|
174
267
|
// direction as the resolver-error path in [gateDecision]. The static-gate fast path skips it
|
|
175
268
|
// entirely once a resolver-less gate is set.
|
|
176
|
-
override var resolveGate: (request: NativeGateRequest) -> Promise<Promise<GateDecision>> =
|
|
177
|
-
|
|
178
|
-
}
|
|
269
|
+
override var resolveGate: (request: NativeGateRequest) -> Promise<Promise<GateDecision>> =
|
|
270
|
+
defaultResolveGate
|
|
179
271
|
override var onGate: (event: GateEvent) -> Unit = {}
|
|
180
272
|
|
|
181
273
|
// MARK: Player callbacks
|
|
@@ -239,12 +331,14 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
239
331
|
}
|
|
240
332
|
|
|
241
333
|
init {
|
|
334
|
+
current.set(this)
|
|
335
|
+
|
|
242
336
|
// Auto-bind to service if it's already running
|
|
243
337
|
launchInScope {
|
|
244
338
|
try {
|
|
245
339
|
Timber.d("Attempting to auto-bind to existing AudioBrowserService from AudioBrowser")
|
|
246
340
|
val intent = Intent(context, Service::class.java)
|
|
247
|
-
val bound =
|
|
341
|
+
val bound = serviceBinding.bind(intent, this@AudioBrowser)
|
|
248
342
|
Timber.d("Auto-bind result: $bound")
|
|
249
343
|
|
|
250
344
|
if (!bound) {
|
|
@@ -286,6 +380,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
286
380
|
routes = _configuration.routes,
|
|
287
381
|
singleTrack = _configuration.singleTrack ?: false,
|
|
288
382
|
androidControllerOfflineError = _configuration.androidControllerOfflineError ?: true,
|
|
383
|
+
viewMoreTitle = _configuration.viewMoreTitle,
|
|
289
384
|
)
|
|
290
385
|
}
|
|
291
386
|
|
|
@@ -295,9 +390,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
295
390
|
* bridge: it runs on ExoPlayer's IO thread (TransformingDataSource.open), so blocking here is
|
|
296
391
|
* safe and intentional.
|
|
297
392
|
*/
|
|
298
|
-
fun getMediaRequestConfig(originalUrl: String): MediaRequestConfig? {
|
|
393
|
+
fun getMediaRequestConfig(originalUrl: String, track: Track): MediaRequestConfig? {
|
|
299
394
|
return try {
|
|
300
|
-
runBlocking { browserManager.resolveMediaUrl(originalUrl) }
|
|
395
|
+
runBlocking { browserManager.resolveMediaUrl(originalUrl, track) }
|
|
301
396
|
} catch (e: Exception) {
|
|
302
397
|
Timber.e(e, "Failed to transform media URL: $originalUrl")
|
|
303
398
|
null
|
|
@@ -319,8 +414,8 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
319
414
|
browserManager.config = buildConfig()
|
|
320
415
|
val tabs = browserManager.queryTabs()
|
|
321
416
|
if (tabs.isNotEmpty()) {
|
|
322
|
-
Timber.d("Using first tab as default path: ${tabs[0].
|
|
323
|
-
tabs[0].
|
|
417
|
+
Timber.d("Using first tab as default path: ${tabs[0].path}")
|
|
418
|
+
tabs[0].path
|
|
324
419
|
} else {
|
|
325
420
|
Timber.d("Using root path as default: /")
|
|
326
421
|
"/"
|
|
@@ -375,8 +470,14 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
375
470
|
browserManager.config = buildConfig()
|
|
376
471
|
|
|
377
472
|
// Notify player that browser configuration is ready (routes/tabs available)
|
|
378
|
-
// This allows Android Auto to start browsing content
|
|
379
|
-
|
|
473
|
+
// This allows Android Auto to start browsing content.
|
|
474
|
+
// This reaches MediaSession.getConnectedControllers, which asserts the
|
|
475
|
+
// main thread, and this setter runs on the JS thread. Hop without
|
|
476
|
+
// blocking -- runBlockingOnMain would deadlock here for the same reason
|
|
477
|
+
// described for the navigation below (JS callbacks can't run while the
|
|
478
|
+
// JS thread waits). Ordering with navigationJob is preserved: both are
|
|
479
|
+
// queued on mainScope.
|
|
480
|
+
launchInScope { connectedService?.player?.notifyBrowserConfigurationReady() }
|
|
380
481
|
|
|
381
482
|
clearNavigationError()
|
|
382
483
|
|
|
@@ -408,121 +509,56 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
408
509
|
|
|
409
510
|
override fun getFormattedNavigationError(): FormattedNavigationError? = formattedNavigationError
|
|
410
511
|
|
|
411
|
-
/**
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
private fun httpStatusText(statusCode: Int): String {
|
|
433
|
-
return when (statusCode) {
|
|
434
|
-
400 -> "Bad Request"
|
|
435
|
-
401 -> "Unauthorized"
|
|
436
|
-
403 -> "Forbidden"
|
|
437
|
-
404 -> "Not Found"
|
|
438
|
-
405 -> "Method Not Allowed"
|
|
439
|
-
408 -> "Request Timeout"
|
|
440
|
-
429 -> "Too Many Requests"
|
|
441
|
-
500 -> "Internal Server Error"
|
|
442
|
-
502 -> "Bad Gateway"
|
|
443
|
-
503 -> "Service Unavailable"
|
|
444
|
-
504 -> "Gateway Timeout"
|
|
445
|
-
else -> "Server Error"
|
|
512
|
+
/**
|
|
513
|
+
* Resolves a navigation error to its display form: the app's `formatNavigationError` for the
|
|
514
|
+
* given [path] when one is configured, else the built-in default. Shared by [setNavigationError]
|
|
515
|
+
* and the Android Auto empty tile so in-app and in-car copy cannot drift (ADR 0001).
|
|
516
|
+
*/
|
|
517
|
+
internal suspend fun resolveFormattedError(
|
|
518
|
+
error: NavigationError,
|
|
519
|
+
path: String,
|
|
520
|
+
): FormattedNavigationError {
|
|
521
|
+
val default = defaultFormattedError(error)
|
|
522
|
+
val formatter = _configuration.formatNavigationError ?: return default
|
|
523
|
+
return formattedOrDefault(mainScope, default) {
|
|
524
|
+
formatter(
|
|
525
|
+
FormatNavigationErrorParams(
|
|
526
|
+
error,
|
|
527
|
+
default,
|
|
528
|
+
path,
|
|
529
|
+
BrowserPathHelper.navigationErrorKind(path),
|
|
530
|
+
)
|
|
531
|
+
)
|
|
532
|
+
.await()
|
|
446
533
|
}
|
|
447
534
|
}
|
|
448
535
|
|
|
449
|
-
private fun setNavigationError(
|
|
450
|
-
code: NavigationErrorType,
|
|
451
|
-
message: String,
|
|
452
|
-
path: String,
|
|
453
|
-
statusCode: Double? = null,
|
|
454
|
-
statusCodeSuccess: Boolean? = null,
|
|
455
|
-
) {
|
|
456
|
-
val navError = NavigationError(code, message, statusCode, statusCodeSuccess)
|
|
536
|
+
private fun setNavigationError(navError: NavigationError, path: String) {
|
|
457
537
|
navigationError = navError
|
|
458
538
|
onNavigationError(NavigationErrorEvent(navigationError))
|
|
459
539
|
|
|
460
|
-
//
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
if (
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
} else {
|
|
475
|
-
formattedNavigationError = defaultFormatted
|
|
476
|
-
onFormattedNavigationError(formattedNavigationError)
|
|
540
|
+
// No formatter means no hop, and the field and event land in this turn: a same-turn
|
|
541
|
+
// getFormattedNavigationError, or a clearNavigationError right after, must not race a
|
|
542
|
+
// launch that has yet to run.
|
|
543
|
+
if (_configuration.formatNavigationError == null) {
|
|
544
|
+
val default = defaultFormattedError(navError)
|
|
545
|
+
formattedNavigationError = default
|
|
546
|
+
onFormattedNavigationError(default)
|
|
547
|
+
return
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
mainScope.launch {
|
|
551
|
+
val formatted = resolveFormattedError(navError, path)
|
|
552
|
+
formattedNavigationError = formatted
|
|
553
|
+
onFormattedNavigationError(formatted)
|
|
477
554
|
}
|
|
478
555
|
}
|
|
479
556
|
|
|
480
|
-
/**
|
|
557
|
+
/** Raises the navigation error [e] maps to, for a failed navigation to [path]. */
|
|
481
558
|
private fun handleBrowserException(e: Exception, path: String, logContext: String) {
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
setNavigationError(
|
|
486
|
-
NavigationErrorType.HTTP_ERROR,
|
|
487
|
-
e.message ?: "Server error",
|
|
488
|
-
path,
|
|
489
|
-
e.statusCode.toDouble(),
|
|
490
|
-
e.statusCode in 200..299,
|
|
491
|
-
)
|
|
492
|
-
}
|
|
493
|
-
is NetworkException -> {
|
|
494
|
-
Timber.e(e, "Network error $logContext")
|
|
495
|
-
setNavigationError(
|
|
496
|
-
NavigationErrorType.NETWORK_ERROR,
|
|
497
|
-
e.message ?: "Network request failed",
|
|
498
|
-
path,
|
|
499
|
-
)
|
|
500
|
-
}
|
|
501
|
-
is ContentNotFoundException -> {
|
|
502
|
-
Timber.e(e, "Content not found $logContext")
|
|
503
|
-
setNavigationError(
|
|
504
|
-
NavigationErrorType.CONTENT_NOT_FOUND,
|
|
505
|
-
e.message ?: "Content not found",
|
|
506
|
-
path,
|
|
507
|
-
)
|
|
508
|
-
}
|
|
509
|
-
is CallbackException -> {
|
|
510
|
-
Timber.e(e, "Callback error $logContext")
|
|
511
|
-
setNavigationError(
|
|
512
|
-
NavigationErrorType.CALLBACK_ERROR,
|
|
513
|
-
e.message ?: "An error occurred",
|
|
514
|
-
path,
|
|
515
|
-
)
|
|
516
|
-
}
|
|
517
|
-
else -> {
|
|
518
|
-
Timber.e(e, "Unexpected error $logContext")
|
|
519
|
-
setNavigationError(
|
|
520
|
-
NavigationErrorType.UNKNOWN_ERROR,
|
|
521
|
-
e.message ?: "An unexpected error occurred",
|
|
522
|
-
path,
|
|
523
|
-
)
|
|
524
|
-
}
|
|
525
|
-
}
|
|
559
|
+
val navError = navigationErrorFor(e)
|
|
560
|
+
Timber.e(e, "${navError.code} $logContext")
|
|
561
|
+
setNavigationError(navError, path)
|
|
526
562
|
}
|
|
527
563
|
|
|
528
564
|
private fun clearNavigationError() {
|
|
@@ -558,26 +594,38 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
558
594
|
}
|
|
559
595
|
|
|
560
596
|
override fun navigateTrack(track: Track) {
|
|
597
|
+
// A disabled track is unavailable — it never plays, whichever surface or
|
|
598
|
+
// stale resume path delivered the selection (Track.disabled; mirrors iOS
|
|
599
|
+
// TrackSelector.select). Refused before any state changes: an inert tap
|
|
600
|
+
// must not clear an unrelated navigation error or cancel an in-flight
|
|
601
|
+
// navigation.
|
|
602
|
+
if (track.disabled == true) {
|
|
603
|
+
Timber.d("Ignoring selection of disabled track: ${track.title}")
|
|
604
|
+
return
|
|
605
|
+
}
|
|
606
|
+
|
|
561
607
|
clearNavigationError()
|
|
562
608
|
|
|
563
609
|
// Cancel previous navigation to avoid race conditions
|
|
564
610
|
navigationJob?.cancel()
|
|
565
611
|
|
|
566
|
-
val
|
|
612
|
+
val path = track.path
|
|
567
613
|
navigationJob =
|
|
568
614
|
mainScope.launch {
|
|
569
615
|
try {
|
|
570
616
|
when {
|
|
571
|
-
// Check if this is a contextual
|
|
572
|
-
|
|
573
|
-
Timber.d("Navigating to contextual track
|
|
617
|
+
// Check if this is a contextual path (playable-only track with queue context)
|
|
618
|
+
path != null && BrowserPathHelper.isContextual(path) -> {
|
|
619
|
+
Timber.d("Navigating to contextual track path: $path")
|
|
574
620
|
|
|
575
|
-
val parentPath = BrowserPathHelper.stripTrackId(
|
|
576
|
-
val trackId = BrowserPathHelper.extractTrackId(
|
|
621
|
+
val parentPath = BrowserPathHelper.stripTrackId(path)
|
|
622
|
+
val trackId = BrowserPathHelper.extractTrackId(path)
|
|
577
623
|
|
|
578
|
-
// Check if queue already came from this parent path - just skip
|
|
624
|
+
// Check if queue already came from this parent path - just skip
|
|
625
|
+
// to the tapped surface (exact path first, identity for
|
|
626
|
+
// index-less paths — see indexOfTappedTrack)
|
|
579
627
|
if (trackId != null && parentPath == player.queueSourcePath) {
|
|
580
|
-
val index = player.tracks.
|
|
628
|
+
val index = player.tracks.indexOfTappedTrack(path, trackId)
|
|
581
629
|
if (index >= 0) {
|
|
582
630
|
Timber.d("Queue already from $parentPath, skipping to index $index")
|
|
583
631
|
handleTrackLoad(
|
|
@@ -595,8 +643,8 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
595
643
|
}
|
|
596
644
|
}
|
|
597
645
|
|
|
598
|
-
// Expand the queue from the contextual
|
|
599
|
-
val expanded = browserManager.
|
|
646
|
+
// Expand the queue from the contextual path
|
|
647
|
+
val expanded = browserManager.expandQueueFromContextualPath(path)
|
|
600
648
|
|
|
601
649
|
if (expanded != null) {
|
|
602
650
|
val (tracks, startIndex) = expanded
|
|
@@ -631,9 +679,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
631
679
|
}
|
|
632
680
|
}
|
|
633
681
|
// Navigate to browsable track to show browsing UI
|
|
634
|
-
|
|
635
|
-
Timber.d("Navigating to browsable track: $
|
|
636
|
-
browserManager.navigate(
|
|
682
|
+
path != null -> {
|
|
683
|
+
Timber.d("Navigating to browsable track: $path")
|
|
684
|
+
browserManager.navigate(path)
|
|
637
685
|
}
|
|
638
686
|
// If track is playable (has src), load it into player
|
|
639
687
|
track.src != null -> {
|
|
@@ -648,22 +696,36 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
648
696
|
)
|
|
649
697
|
}
|
|
650
698
|
else -> {
|
|
651
|
-
throw IllegalArgumentException("Track must have either
|
|
699
|
+
throw IllegalArgumentException("Track must have either a 'path' or an 'src' property")
|
|
652
700
|
}
|
|
653
701
|
}
|
|
654
702
|
} catch (e: CancellationException) {
|
|
655
703
|
throw e // Rethrow to properly cancel
|
|
656
704
|
} catch (e: Exception) {
|
|
657
|
-
handleBrowserException(e,
|
|
705
|
+
handleBrowserException(e, path ?: track.src ?: "", "navigating to track: ${track.title}")
|
|
658
706
|
}
|
|
659
707
|
}
|
|
660
708
|
}
|
|
661
709
|
|
|
662
|
-
override fun
|
|
710
|
+
override fun search(query: String): Promise<Array<Track>> {
|
|
663
711
|
return Promise.async(mainScope) {
|
|
664
712
|
Timber.d("Searching for: $query")
|
|
665
|
-
|
|
666
|
-
|
|
713
|
+
// Rejects with the error the browse surface would raise, but leaves the navigation error
|
|
714
|
+
// itself unset: a search is not a navigation, and its failure must not replace the
|
|
715
|
+
// displayed page's state (mirrors HybridAudioBrowser.search).
|
|
716
|
+
val searchResults =
|
|
717
|
+
try {
|
|
718
|
+
browserManager.search(query)
|
|
719
|
+
} catch (e: CancellationException) {
|
|
720
|
+
throw e
|
|
721
|
+
} catch (e: Exception) {
|
|
722
|
+
Timber.e(e, "Search failed for query: $query")
|
|
723
|
+
throw NavigationErrorException(navigationErrorFor(e))
|
|
724
|
+
}
|
|
725
|
+
// Flattened, not `children`: a resolved page carries its rows in
|
|
726
|
+
// `sections` (ADR 0010) and search builds exactly one untitled section,
|
|
727
|
+
// so `children` is always null here and this returned nothing at all.
|
|
728
|
+
searchResults.flattenedChildren?.toTypedArray() ?: emptyArray()
|
|
667
729
|
}
|
|
668
730
|
}
|
|
669
731
|
|
|
@@ -677,8 +739,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
677
739
|
// Invalidate cached content so future navigations fetch fresh data
|
|
678
740
|
browserManager.invalidateContentCache(path)
|
|
679
741
|
|
|
680
|
-
// Notify external media controllers (Android Auto)
|
|
681
|
-
|
|
742
|
+
// Notify external media controllers (Android Auto). Reaches MediaSession,
|
|
743
|
+
// which asserts the main thread; this override runs on the JS thread.
|
|
744
|
+
launchInScope { connectedService?.player?.notifyContentChanged(path) }
|
|
682
745
|
|
|
683
746
|
// If we're currently viewing this path, refresh the content
|
|
684
747
|
if (browserManager.getPath() == path) {
|
|
@@ -692,8 +755,10 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
692
755
|
// Clear all cached content so every path re-fetches fresh data
|
|
693
756
|
browserManager.clearContentCache()
|
|
694
757
|
|
|
695
|
-
// Notify external media controllers (Android Auto) to refresh subscribed paths
|
|
696
|
-
|
|
758
|
+
// Notify external media controllers (Android Auto) to refresh subscribed paths.
|
|
759
|
+
// Reaches MediaSession, which asserts the main thread; this override runs on
|
|
760
|
+
// the JS thread.
|
|
761
|
+
launchInScope { connectedService?.player?.invalidateAllContent() }
|
|
697
762
|
|
|
698
763
|
// Refresh whatever the browser is currently viewing
|
|
699
764
|
mainScope.launch { browserManager.refresh() }
|
|
@@ -734,14 +799,16 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
734
799
|
// Re-query every subscribed parent so a connected controller (Android
|
|
735
800
|
// Auto) swaps its lists for the gate tile without reconnecting. Notify
|
|
736
801
|
// only — the content cache stays warm for when the gate clears.
|
|
737
|
-
|
|
802
|
+
// MediaSession asserts the main thread; this override runs on the JS thread.
|
|
803
|
+
launchInScope { connectedService?.player?.invalidateAllContent() }
|
|
738
804
|
}
|
|
739
805
|
|
|
740
806
|
override fun clearGate() {
|
|
741
807
|
if (!gateState.active) return
|
|
742
808
|
// Single atomic assignment — readers never see a half-cleared triple.
|
|
743
809
|
gateState = GateState(active = false, chrome = null, hasResolver = false)
|
|
744
|
-
|
|
810
|
+
// MediaSession asserts the main thread; this override runs on the JS thread.
|
|
811
|
+
launchInScope { connectedService?.player?.invalidateAllContent() }
|
|
745
812
|
}
|
|
746
813
|
|
|
747
814
|
/**
|
|
@@ -781,7 +848,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
781
848
|
override var onCarConnectedChanged: (Boolean) -> Unit = {}
|
|
782
849
|
set(value) {
|
|
783
850
|
field = value
|
|
784
|
-
carConnectionTarget
|
|
851
|
+
carConnectionTarget.set(value)
|
|
785
852
|
// Immediately notify current state (the car may have connected before
|
|
786
853
|
// this JS runtime subscribed) — mirrors the iOS behavior.
|
|
787
854
|
value(carConnected)
|
|
@@ -794,6 +861,9 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
794
861
|
override fun setupPlayer(options: NativeSetupPlayerOptions): Promise<Unit> {
|
|
795
862
|
return Promise.async(mainScope) {
|
|
796
863
|
setupOptions.update(options)
|
|
864
|
+
options.remoteOutputs?.let { remoteOutputs = it }
|
|
865
|
+
// Applied even when omitted, so a reloaded bundle that omits the option turns it off.
|
|
866
|
+
RemoteOutputs.setEnabled(context, remoteOutputs)
|
|
797
867
|
// The bundled runtime options and initial state are part of the atomic launch
|
|
798
868
|
// description: stage them here, apply them together with the engine below (or at
|
|
799
869
|
// service connect). Last-write-wins with their imperative counterparts.
|
|
@@ -811,12 +881,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
811
881
|
// Service not connected yet, bind to service
|
|
812
882
|
suspendCoroutine<Unit> { continuation ->
|
|
813
883
|
Timber.d("Binding to AudioBrowserService")
|
|
814
|
-
val bound =
|
|
815
|
-
context.bindService(
|
|
816
|
-
Intent(context, Service::class.java),
|
|
817
|
-
this@AudioBrowser,
|
|
818
|
-
Context.BIND_AUTO_CREATE,
|
|
819
|
-
)
|
|
884
|
+
val bound = serviceBinding.bind(Intent(context, Service::class.java), this@AudioBrowser)
|
|
820
885
|
|
|
821
886
|
if (!bound) {
|
|
822
887
|
continuation.resumeWithException(
|
|
@@ -832,8 +897,17 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
832
897
|
|
|
833
898
|
override fun updateOptions(options: NativeUpdateOptions) {
|
|
834
899
|
updateOptions.updateFromBridge(options)
|
|
835
|
-
// Only update the options if the service is around
|
|
836
|
-
|
|
900
|
+
// Only update the options if the service is around.
|
|
901
|
+
// applyOptions touches the Media3 player, which asserts it is only ever
|
|
902
|
+
// driven from the main thread ("Player callback method is called from a
|
|
903
|
+
// wrong thread"). Nitro invokes this from the JS thread, so hop.
|
|
904
|
+
//
|
|
905
|
+
// The hop blocks rather than launching because `updateOptions` is a single
|
|
906
|
+
// mutable holder: updateFromBridge mutates it in place on the JS thread and
|
|
907
|
+
// applyOptions reads it on main. Blocking is what keeps the two ordered.
|
|
908
|
+
connectedService?.let { service ->
|
|
909
|
+
runBlockingOnMain { service.player.applyOptions(updateOptions) }
|
|
910
|
+
}
|
|
837
911
|
}
|
|
838
912
|
|
|
839
913
|
override fun getOptions(): Options {
|
|
@@ -847,25 +921,27 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
847
921
|
// ============================================================================
|
|
848
922
|
|
|
849
923
|
override fun load(track: Track) {
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
924
|
+
// Throws without a player, as on iOS: a track asked for and silently dropped hides a mistake.
|
|
925
|
+
// Blocks rather than launching, so a track the player refuses fails this call.
|
|
926
|
+
runBlockingOnMain { player.load(track) }
|
|
927
|
+
}
|
|
928
|
+
|
|
929
|
+
override fun reset() =
|
|
930
|
+
commandPlayer("reset") { player ->
|
|
931
|
+
player.stop()
|
|
932
|
+
player.clear()
|
|
933
|
+
// clear() while IDLE emits no engine event, so the state machine never
|
|
934
|
+
// leaves STOPPED — a reset queue is "nothing loaded".
|
|
935
|
+
player.setPlaybackState(PlaybackState.NONE)
|
|
936
|
+
}
|
|
861
937
|
|
|
862
|
-
override fun play() =
|
|
938
|
+
override fun play() = commandPlayer("play") { it.play() }
|
|
863
939
|
|
|
864
|
-
override fun pause() =
|
|
940
|
+
override fun pause() = commandPlayer("pause") { it.pause() }
|
|
865
941
|
|
|
866
|
-
override fun togglePlayback() =
|
|
942
|
+
override fun togglePlayback() = commandPlayer("togglePlayback") { it.togglePlayback() }
|
|
867
943
|
|
|
868
|
-
override fun stop() =
|
|
944
|
+
override fun stop() = commandPlayer("stop") { it.stop() }
|
|
869
945
|
|
|
870
946
|
override fun setPlayWhenReady(playWhenReady: Boolean) = runBlockingOnMain {
|
|
871
947
|
// Pre-setup this stages the intent for the player to come up with — never throws.
|
|
@@ -877,35 +953,41 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
877
953
|
connectedService?.player?.playWhenReady ?: pendingPlayWhenReady ?: false
|
|
878
954
|
}
|
|
879
955
|
|
|
880
|
-
override fun seekTo(position: Double) =
|
|
881
|
-
|
|
882
|
-
|
|
956
|
+
override fun seekTo(position: Double) =
|
|
957
|
+
commandPlayer("seekTo") { player ->
|
|
958
|
+
player.seekTo((position * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
959
|
+
}
|
|
883
960
|
|
|
884
|
-
override fun seekBy(offset: Double) =
|
|
885
|
-
|
|
886
|
-
|
|
961
|
+
override fun seekBy(offset: Double) =
|
|
962
|
+
commandPlayer("seekBy") { player ->
|
|
963
|
+
player.seekBy((offset * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
964
|
+
}
|
|
887
965
|
|
|
888
|
-
override fun seekToLiveEdge() =
|
|
966
|
+
override fun seekToLiveEdge() = commandPlayer("seekToLiveEdge") { it.seekToLiveEdge() }
|
|
889
967
|
|
|
890
|
-
override fun setVolume(level: Double) =
|
|
968
|
+
override fun setVolume(level: Double) = commandPlayer("setVolume") { it.volume = level.toFloat() }
|
|
891
969
|
|
|
892
|
-
override fun getVolume(): Double =
|
|
970
|
+
override fun getVolume(): Double = readPlayer(1.0) { it.volume.toDouble() }
|
|
893
971
|
|
|
894
|
-
override fun setRate(rate: Double) =
|
|
972
|
+
override fun setRate(rate: Double) =
|
|
973
|
+
commandPlayer("setRate") { it.playbackSpeed = rate.toFloat() }
|
|
895
974
|
|
|
896
|
-
override fun getRate(): Double =
|
|
975
|
+
override fun getRate(): Double = readPlayer(1.0) { it.playbackSpeed.toDouble() }
|
|
897
976
|
|
|
898
|
-
override fun getProgress(): Progress =
|
|
899
|
-
Progress(
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
903
|
-
|
|
904
|
-
|
|
977
|
+
override fun getProgress(): Progress =
|
|
978
|
+
readPlayer(Progress(duration = 0.0, position = 0.0, buffered = 0.0)) { player ->
|
|
979
|
+
Progress(
|
|
980
|
+
duration = player.duration.toSeconds(),
|
|
981
|
+
position = player.position.toSeconds(),
|
|
982
|
+
buffered = player.bufferedPosition.toSeconds(),
|
|
983
|
+
)
|
|
984
|
+
}
|
|
905
985
|
|
|
906
|
-
override fun getPlayback(): Playback =
|
|
986
|
+
override fun getPlayback(): Playback =
|
|
987
|
+
readPlayer(Playback(PlaybackState.NONE, null)) { it.getPlayback() }
|
|
907
988
|
|
|
908
|
-
override fun getPlayingState(): PlayingState =
|
|
989
|
+
override fun getPlayingState(): PlayingState =
|
|
990
|
+
readPlayer(PlayingState(playing = false, buffering = false)) { it.getPlayingState() }
|
|
909
991
|
|
|
910
992
|
override fun getRepeatMode(): RepeatMode = runBlockingOnMain {
|
|
911
993
|
connectedService?.player?.repeatMode ?: pendingRepeatMode ?: RepeatMode.OFF
|
|
@@ -916,118 +998,121 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
916
998
|
connectedService?.player?.let { it.repeatMode = mode } ?: run { pendingRepeatMode = mode }
|
|
917
999
|
}
|
|
918
1000
|
|
|
919
|
-
override fun getShuffleEnabled(): Boolean =
|
|
1001
|
+
override fun getShuffleEnabled(): Boolean = readPlayer(false) { it.shuffleMode }
|
|
920
1002
|
|
|
921
|
-
override fun setShuffleEnabled(enabled: Boolean) =
|
|
922
|
-
player.shuffleMode = enabled
|
|
923
|
-
}
|
|
1003
|
+
override fun setShuffleEnabled(enabled: Boolean) =
|
|
1004
|
+
commandPlayer("setShuffleEnabled") { player -> player.shuffleMode = enabled }
|
|
924
1005
|
|
|
925
|
-
override fun setPlaybackIntervalEnabled(enabled: Boolean) =
|
|
926
|
-
|
|
927
|
-
|
|
1006
|
+
override fun setPlaybackIntervalEnabled(enabled: Boolean) =
|
|
1007
|
+
commandPlayer("setPlaybackIntervalEnabled") { player ->
|
|
1008
|
+
player.setPlaybackIntervalEnabled(enabled)
|
|
1009
|
+
}
|
|
928
1010
|
|
|
929
|
-
override fun getPlaybackError(): PlaybackError? =
|
|
1011
|
+
override fun getPlaybackError(): PlaybackError? = readPlayer(null) { it.playbackError }
|
|
930
1012
|
|
|
931
|
-
override fun retry() =
|
|
1013
|
+
override fun retry() = commandPlayer("retry") { it.prepare() }
|
|
932
1014
|
|
|
933
1015
|
// ============================================================================
|
|
934
1016
|
// MARK: Queue Management
|
|
935
1017
|
// ============================================================================
|
|
936
1018
|
|
|
937
|
-
override fun add(tracks: Array<Track>, insertBeforeIndex: Double?) =
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
1019
|
+
override fun add(tracks: Array<Track>, insertBeforeIndex: Double?) =
|
|
1020
|
+
commandPlayer("add") { player ->
|
|
1021
|
+
val inputIndex = insertBeforeIndex?.toInt() ?: -1
|
|
1022
|
+
player.add(tracks, inputIndex)
|
|
1023
|
+
}
|
|
941
1024
|
|
|
942
|
-
override fun move(fromIndex: Double, toIndex: Double) =
|
|
943
|
-
player.move(fromIndex.toInt(), toIndex.toInt())
|
|
944
|
-
}
|
|
1025
|
+
override fun move(fromIndex: Double, toIndex: Double) =
|
|
1026
|
+
commandPlayer("move") { player -> player.move(fromIndex.toInt(), toIndex.toInt()) }
|
|
945
1027
|
|
|
946
|
-
override fun remove(indexes: DoubleArray) =
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
1028
|
+
override fun remove(indexes: DoubleArray) =
|
|
1029
|
+
commandPlayer("remove") { player ->
|
|
1030
|
+
val indexList = indexes.map { it.toInt() }
|
|
1031
|
+
player.remove(indexList)
|
|
1032
|
+
}
|
|
950
1033
|
|
|
951
|
-
override fun removeUpcomingTracks() =
|
|
1034
|
+
override fun removeUpcomingTracks() =
|
|
1035
|
+
commandPlayer("removeUpcomingTracks") { it.removeUpcomingTracks() }
|
|
952
1036
|
|
|
953
|
-
override fun skip(index: Double, initialPosition: Double?) =
|
|
954
|
-
|
|
1037
|
+
override fun skip(index: Double, initialPosition: Double?) =
|
|
1038
|
+
commandPlayer("skip") { player ->
|
|
1039
|
+
player.skipTo(index.toInt())
|
|
955
1040
|
|
|
956
|
-
|
|
957
|
-
|
|
1041
|
+
if (initialPosition != null && initialPosition >= 0) {
|
|
1042
|
+
player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
1043
|
+
}
|
|
958
1044
|
}
|
|
959
|
-
}
|
|
960
1045
|
|
|
961
|
-
override fun skipToNext(initialPosition: Double?) =
|
|
962
|
-
|
|
1046
|
+
override fun skipToNext(initialPosition: Double?) =
|
|
1047
|
+
commandPlayer("skipToNext") { player ->
|
|
1048
|
+
player.next()
|
|
963
1049
|
|
|
964
|
-
|
|
965
|
-
|
|
1050
|
+
if (initialPosition != null && initialPosition >= 0) {
|
|
1051
|
+
player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
1052
|
+
}
|
|
966
1053
|
}
|
|
967
|
-
}
|
|
968
1054
|
|
|
969
|
-
override fun skipToPrevious(initialPosition: Double?) =
|
|
970
|
-
|
|
1055
|
+
override fun skipToPrevious(initialPosition: Double?) =
|
|
1056
|
+
commandPlayer("skipToPrevious") { player ->
|
|
1057
|
+
player.previous()
|
|
971
1058
|
|
|
972
|
-
|
|
973
|
-
|
|
1059
|
+
if (initialPosition != null && initialPosition >= 0) {
|
|
1060
|
+
player.seekTo((initialPosition * 1000).toLong(), TimeUnit.MILLISECONDS)
|
|
1061
|
+
}
|
|
974
1062
|
}
|
|
975
|
-
}
|
|
976
1063
|
|
|
977
1064
|
override fun setQueue(tracks: Array<Track>, startIndex: Double?, startPosition: Double?) =
|
|
978
|
-
|
|
1065
|
+
commandPlayer("setQueue") { player ->
|
|
979
1066
|
player.setQueue(tracks, startIndex?.toInt() ?: 0, ((startPosition ?: 0.0) * 1000).toLong())
|
|
980
1067
|
}
|
|
981
1068
|
|
|
982
|
-
override fun setActiveTrackFavorited(favorited: Boolean) =
|
|
983
|
-
|
|
984
|
-
|
|
1069
|
+
override fun setActiveTrackFavorited(favorited: Boolean): Unit =
|
|
1070
|
+
commandPlayer("setActiveTrackFavorited") { player ->
|
|
1071
|
+
// Applied-result is for MediaSession honesty; the JS API stays fire-and-forget.
|
|
1072
|
+
player.setActiveTrackFavorited(favorited)
|
|
1073
|
+
}
|
|
985
1074
|
|
|
986
|
-
override fun toggleActiveTrackFavorited() =
|
|
987
|
-
|
|
988
|
-
}
|
|
1075
|
+
override fun toggleActiveTrackFavorited(): Unit =
|
|
1076
|
+
commandPlayer("toggleActiveTrackFavorited") { it.toggleActiveTrackFavorited() }
|
|
989
1077
|
|
|
990
|
-
override fun getQueue(): Array<Track> =
|
|
1078
|
+
override fun getQueue(): Array<Track> = readPlayer(emptyArray()) { it.tracks }
|
|
991
1079
|
|
|
992
|
-
override fun getTrack(index: Double): Track? =
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
1080
|
+
override fun getTrack(index: Double): Track? =
|
|
1081
|
+
readPlayer(null) { player ->
|
|
1082
|
+
try {
|
|
1083
|
+
player.getTrack(index.toInt())
|
|
1084
|
+
} catch (e: IllegalArgumentException) {
|
|
1085
|
+
null
|
|
1086
|
+
}
|
|
997
1087
|
}
|
|
998
|
-
}
|
|
999
1088
|
|
|
1000
|
-
override fun getActiveTrackIndex(): Double? =
|
|
1001
|
-
player.currentIndex?.toDouble()
|
|
1002
|
-
}
|
|
1089
|
+
override fun getActiveTrackIndex(): Double? = readPlayer(null) { it.currentIndex?.toDouble() }
|
|
1003
1090
|
|
|
1004
|
-
override fun getActiveTrack(): Track? =
|
|
1091
|
+
override fun getActiveTrack(): Track? = readPlayer(null) { it.currentTrack }
|
|
1005
1092
|
|
|
1006
1093
|
// ============================================================================
|
|
1007
1094
|
// MARK: Now Playing Metadata
|
|
1008
1095
|
// ============================================================================
|
|
1009
1096
|
|
|
1010
|
-
override fun updateNowPlaying(update: NowPlayingUpdate?) =
|
|
1011
|
-
player.nowPlaying.updateNowPlaying(update)
|
|
1012
|
-
}
|
|
1097
|
+
override fun updateNowPlaying(update: NowPlayingUpdate?) =
|
|
1098
|
+
commandPlayer("updateNowPlaying") { player -> player.nowPlaying.updateNowPlaying(update) }
|
|
1013
1099
|
|
|
1014
|
-
override fun flashNowPlaying(update: NowPlayingUpdate, durationMs: Double) =
|
|
1015
|
-
|
|
1016
|
-
|
|
1100
|
+
override fun flashNowPlaying(update: NowPlayingUpdate, durationMs: Double) =
|
|
1101
|
+
commandPlayer("flashNowPlaying") { player ->
|
|
1102
|
+
player.nowPlaying.flashNowPlaying(update, durationMs)
|
|
1103
|
+
}
|
|
1017
1104
|
|
|
1018
|
-
override fun clearNowPlayingFlash() =
|
|
1019
|
-
player.nowPlaying.clearNowPlayingFlash()
|
|
1020
|
-
}
|
|
1105
|
+
override fun clearNowPlayingFlash() =
|
|
1106
|
+
commandPlayer("clearNowPlayingFlash") { player -> player.nowPlaying.clearNowPlayingFlash() }
|
|
1021
1107
|
|
|
1022
|
-
override fun getNowPlaying(): NowPlayingMetadata? =
|
|
1023
|
-
player.nowPlaying.getNowPlaying()
|
|
1024
|
-
}
|
|
1108
|
+
override fun getNowPlaying(): NowPlayingMetadata? =
|
|
1109
|
+
readPlayer(null) { player -> player.nowPlaying.getNowPlaying() }
|
|
1025
1110
|
|
|
1026
1111
|
// ============================================================================
|
|
1027
1112
|
// MARK: Network Connectivity
|
|
1028
1113
|
// ============================================================================
|
|
1029
1114
|
|
|
1030
|
-
override fun getOnline(): Boolean =
|
|
1115
|
+
override fun getOnline(): Boolean = readPlayer(true) { it.getOnline() }
|
|
1031
1116
|
|
|
1032
1117
|
// ============================================================================
|
|
1033
1118
|
// MARK: System Volume
|
|
@@ -1053,35 +1138,32 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1053
1138
|
// MARK: Equalizer (Android only)
|
|
1054
1139
|
// ============================================================================
|
|
1055
1140
|
|
|
1056
|
-
override fun getEqualizerSettings(): EqualizerSettings? =
|
|
1057
|
-
player.equalizer.getSettings()
|
|
1058
|
-
}
|
|
1141
|
+
override fun getEqualizerSettings(): EqualizerSettings? =
|
|
1142
|
+
readPlayer(null) { player -> player.equalizer.getSettings() }
|
|
1059
1143
|
|
|
1060
|
-
override fun setEqualizerEnabled(enabled: Boolean) =
|
|
1061
|
-
player.equalizer.setEnabled(enabled)
|
|
1062
|
-
}
|
|
1144
|
+
override fun setEqualizerEnabled(enabled: Boolean) =
|
|
1145
|
+
commandPlayer("setEqualizerEnabled") { player -> player.equalizer.setEnabled(enabled) }
|
|
1063
1146
|
|
|
1064
|
-
override fun setEqualizerPreset(preset: String) =
|
|
1065
|
-
player.equalizer.setPreset(preset)
|
|
1066
|
-
}
|
|
1147
|
+
override fun setEqualizerPreset(preset: String) =
|
|
1148
|
+
commandPlayer("setEqualizerPreset") { player -> player.equalizer.setPreset(preset) }
|
|
1067
1149
|
|
|
1068
|
-
override fun setEqualizerLevels(levels: DoubleArray) =
|
|
1069
|
-
player.equalizer.setLevels(levels)
|
|
1070
|
-
}
|
|
1150
|
+
override fun setEqualizerLevels(levels: DoubleArray) =
|
|
1151
|
+
commandPlayer("setEqualizerLevels") { player -> player.equalizer.setLevels(levels) }
|
|
1071
1152
|
|
|
1072
1153
|
// ============================================================================
|
|
1073
1154
|
// MARK: Sleep Timer
|
|
1074
1155
|
// ============================================================================
|
|
1075
1156
|
|
|
1076
|
-
override fun getSleepTimer(): SleepTimer =
|
|
1157
|
+
override fun getSleepTimer(): SleepTimer =
|
|
1158
|
+
readPlayer(SleepTimer.create(NullType.NULL)) { it.sleepTimer.get() }
|
|
1077
1159
|
|
|
1078
|
-
override fun setSleepTimer(seconds: Double, fadeDuration: Double?) =
|
|
1079
|
-
player.sleepTimer.setAfter(seconds, fadeDuration)
|
|
1080
|
-
}
|
|
1160
|
+
override fun setSleepTimer(seconds: Double, fadeDuration: Double?) =
|
|
1161
|
+
commandPlayer("setSleepTimer") { player -> player.sleepTimer.setAfter(seconds, fadeDuration) }
|
|
1081
1162
|
|
|
1082
|
-
override fun setSleepTimerToEndOfTrack() =
|
|
1163
|
+
override fun setSleepTimerToEndOfTrack() =
|
|
1164
|
+
commandPlayer("setSleepTimerToEndOfTrack") { it.sleepTimer.setEndOfTrack() }
|
|
1083
1165
|
|
|
1084
|
-
override fun clearSleepTimer(): Boolean =
|
|
1166
|
+
override fun clearSleepTimer(): Boolean = readPlayer(false) { it.sleepTimer.clear() }
|
|
1085
1167
|
|
|
1086
1168
|
// ============================================================================
|
|
1087
1169
|
// MARK: Battery Optimization (Android only)
|
|
@@ -1175,13 +1257,7 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1175
1257
|
}
|
|
1176
1258
|
|
|
1177
1259
|
// Wire up battery warning callback from service
|
|
1178
|
-
connectedService?.onBatteryWarningPendingChanged =
|
|
1179
|
-
post {
|
|
1180
|
-
this@AudioBrowser.onBatteryWarningPendingChanged(
|
|
1181
|
-
BatteryWarningPendingChangedEvent(pending)
|
|
1182
|
-
)
|
|
1183
|
-
}
|
|
1184
|
-
}
|
|
1260
|
+
connectedService?.onBatteryWarningPendingChanged = onBatteryWarningPending
|
|
1185
1261
|
|
|
1186
1262
|
val sessionToken = SessionToken(context, ComponentName(context, Service::class.java))
|
|
1187
1263
|
mediaBrowserFuture = MediaBrowser.Builder(context, sessionToken).buildAsync()
|
|
@@ -1228,6 +1304,29 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1228
1304
|
private val service: Service
|
|
1229
1305
|
get() = connectedService ?: throw Exception("Player not initialized")
|
|
1230
1306
|
|
|
1307
|
+
/**
|
|
1308
|
+
* The player while its service is connected: not before setupPlayer, nor while the service
|
|
1309
|
+
* restarts.
|
|
1310
|
+
*/
|
|
1311
|
+
private val connectedPlayer: Player?
|
|
1312
|
+
get() = connectedService?.player
|
|
1313
|
+
|
|
1314
|
+
/** What [read] gets from the player, or without one [fallback], the answer iOS gives then. */
|
|
1315
|
+
private fun <T> readPlayer(fallback: T, read: suspend (Player) -> T): T = runBlockingOnMain {
|
|
1316
|
+
val player = connectedPlayer ?: return@runBlockingOnMain fallback
|
|
1317
|
+
read(player)
|
|
1318
|
+
}
|
|
1319
|
+
|
|
1320
|
+
/** Runs [command] on the player; without one it is dropped with a warning, as iOS drops it. */
|
|
1321
|
+
private fun commandPlayer(name: String, command: suspend (Player) -> Unit) = runBlockingOnMain {
|
|
1322
|
+
val player = connectedPlayer
|
|
1323
|
+
if (player == null) {
|
|
1324
|
+
Timber.w("$name before the player is set up, or while its service restarts: ignored")
|
|
1325
|
+
} else {
|
|
1326
|
+
command(player)
|
|
1327
|
+
}
|
|
1328
|
+
}
|
|
1329
|
+
|
|
1231
1330
|
internal val player
|
|
1232
1331
|
get() = service.player
|
|
1233
1332
|
|
|
@@ -1436,9 +1535,27 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1436
1535
|
// callback registers as the single notification target (mirrors the iOS
|
|
1437
1536
|
// static + shared-instance pattern).
|
|
1438
1537
|
@Volatile private var carConnected = false
|
|
1439
|
-
@Volatile
|
|
1538
|
+
// Compare-and-set, not @Volatile: a disposing instance clears the slot only if it still owns
|
|
1539
|
+
// it, and a replacement may be claiming it at the same moment.
|
|
1540
|
+
private val carConnectionTarget = AtomicReference<((Boolean) -> Unit)?>(null)
|
|
1440
1541
|
private var carConnectionObserverStarted = false
|
|
1441
1542
|
|
|
1543
|
+
/**
|
|
1544
|
+
* The instance the current JS runtime is using. Nitro hands out no registry, and the teardown
|
|
1545
|
+
* callback has nothing to dispose without one.
|
|
1546
|
+
*/
|
|
1547
|
+
private val current = AtomicReference<AudioBrowser?>(null)
|
|
1548
|
+
|
|
1549
|
+
/** Called by [AudioBrowserLifecycleModule] when the React instance is torn down. */
|
|
1550
|
+
internal fun disposeCurrent() {
|
|
1551
|
+
current.getAndSet(null)?.dispose()
|
|
1552
|
+
}
|
|
1553
|
+
|
|
1554
|
+
/** Shared by the [resolveGate] initializer and [dispose], which reverts to it. */
|
|
1555
|
+
private val defaultResolveGate: (NativeGateRequest) -> Promise<Promise<GateDecision>> = {
|
|
1556
|
+
Promise.resolved(Promise.resolved(GateDecision(gated = true, gate = null)))
|
|
1557
|
+
}
|
|
1558
|
+
|
|
1442
1559
|
private fun startCarConnectionObserver(context: Context, handler: Handler) {
|
|
1443
1560
|
// Posted to main: LiveData observation is main-thread only, and the
|
|
1444
1561
|
// single-start guard is then only ever touched from one thread.
|
|
@@ -1449,9 +1566,159 @@ class AudioBrowser : HybridAudioBrowserSpec(), ServiceConnection {
|
|
|
1449
1566
|
val connected = type != CarConnection.CONNECTION_TYPE_NOT_CONNECTED
|
|
1450
1567
|
if (connected == carConnected) return@observeForever
|
|
1451
1568
|
carConnected = connected
|
|
1452
|
-
carConnectionTarget?.invoke(connected)
|
|
1569
|
+
carConnectionTarget.get()?.invoke(connected)
|
|
1453
1570
|
}
|
|
1454
1571
|
}
|
|
1455
1572
|
}
|
|
1456
1573
|
}
|
|
1457
1574
|
}
|
|
1575
|
+
|
|
1576
|
+
// MARK: Deep JS-callback stripping (used by dispose)
|
|
1577
|
+
// Functions live at every level of the config, not just the top; each type's strip nils its own.
|
|
1578
|
+
|
|
1579
|
+
private fun NativeBrowserConfiguration.strippingJSCallbacks() =
|
|
1580
|
+
copy(
|
|
1581
|
+
requestResolver = null,
|
|
1582
|
+
browseResolver = null,
|
|
1583
|
+
handleTrackLoad = null,
|
|
1584
|
+
viewMoreTitle = null,
|
|
1585
|
+
resolveAlbumPath = null,
|
|
1586
|
+
formatNavigationError = null,
|
|
1587
|
+
request = request?.strippingJSCallbacks(),
|
|
1588
|
+
browse = browse?.strippingJSCallbacks(),
|
|
1589
|
+
media = media?.strippingJSCallbacks(),
|
|
1590
|
+
artwork = artwork?.strippingJSCallbacks(),
|
|
1591
|
+
nowPlayingArtwork = nowPlayingArtwork?.strippingJSCallbacks(),
|
|
1592
|
+
routes = routes?.map { it.strippingJSCallbacks() }?.toTypedArray(),
|
|
1593
|
+
)
|
|
1594
|
+
|
|
1595
|
+
private fun TransformableRequestConfig.strippingJSCallbacks() =
|
|
1596
|
+
copy(transform = null, transformSync = null)
|
|
1597
|
+
|
|
1598
|
+
private fun MediaRequestConfig.strippingJSCallbacks() =
|
|
1599
|
+
copy(resolve = null, resolveSync = null, transform = null, transformSync = null)
|
|
1600
|
+
|
|
1601
|
+
private fun ArtworkRequestConfig.strippingJSCallbacks() =
|
|
1602
|
+
copy(resolve = null, resolveSync = null, transform = null, transformSync = null)
|
|
1603
|
+
|
|
1604
|
+
private fun NativeRouteEntry.strippingJSCallbacks() =
|
|
1605
|
+
copy(
|
|
1606
|
+
browseCallback = null,
|
|
1607
|
+
browseConfig = browseConfig?.strippingJSCallbacks(),
|
|
1608
|
+
searchCallback = null,
|
|
1609
|
+
searchConfig = searchConfig?.strippingJSCallbacks(),
|
|
1610
|
+
media = media?.strippingJSCallbacks(),
|
|
1611
|
+
artwork = artwork?.strippingJSCallbacks(),
|
|
1612
|
+
)
|
|
1613
|
+
|
|
1614
|
+
/**
|
|
1615
|
+
* Ceiling on the app's `formatNavigationError` hop. Same budget [Player.awaitBrowser] gives the JS
|
|
1616
|
+
* side, the only other JS wait a browse serve already blocks on.
|
|
1617
|
+
*/
|
|
1618
|
+
private val FORMATTER_TIMEOUT = 10.seconds
|
|
1619
|
+
|
|
1620
|
+
/**
|
|
1621
|
+
* The navigation error an exception raises. Shared by [AudioBrowser]'s failed navigations, the
|
|
1622
|
+
* rejection [AudioBrowser.search] hands JS, and the Android Auto browse-error tile, so one failure
|
|
1623
|
+
* is named one way wherever it surfaces.
|
|
1624
|
+
*/
|
|
1625
|
+
internal fun navigationErrorFor(e: Exception): NavigationError =
|
|
1626
|
+
when (e) {
|
|
1627
|
+
is HttpStatusException ->
|
|
1628
|
+
NavigationError(
|
|
1629
|
+
NavigationErrorType.HTTP_ERROR,
|
|
1630
|
+
e.message ?: "Server error",
|
|
1631
|
+
e.statusCode.toDouble(),
|
|
1632
|
+
e.statusCode in 200..299,
|
|
1633
|
+
)
|
|
1634
|
+
is NetworkException ->
|
|
1635
|
+
NavigationError(
|
|
1636
|
+
NavigationErrorType.NETWORK_ERROR,
|
|
1637
|
+
e.message ?: "Network request failed",
|
|
1638
|
+
null,
|
|
1639
|
+
null,
|
|
1640
|
+
)
|
|
1641
|
+
is ContentNotFoundException ->
|
|
1642
|
+
NavigationError(
|
|
1643
|
+
NavigationErrorType.CONTENT_NOT_FOUND,
|
|
1644
|
+
e.message ?: "Content not found",
|
|
1645
|
+
null,
|
|
1646
|
+
null,
|
|
1647
|
+
)
|
|
1648
|
+
is CallbackException ->
|
|
1649
|
+
NavigationError(
|
|
1650
|
+
NavigationErrorType.CALLBACK_ERROR,
|
|
1651
|
+
e.message ?: "An error occurred",
|
|
1652
|
+
null,
|
|
1653
|
+
null,
|
|
1654
|
+
)
|
|
1655
|
+
else ->
|
|
1656
|
+
NavigationError(
|
|
1657
|
+
NavigationErrorType.UNKNOWN_ERROR,
|
|
1658
|
+
e.message ?: "An unexpected error occurred",
|
|
1659
|
+
null,
|
|
1660
|
+
null,
|
|
1661
|
+
)
|
|
1662
|
+
}
|
|
1663
|
+
|
|
1664
|
+
/** Carries a [NavigationError] across a rejected Promise, whose JS error keeps its message. */
|
|
1665
|
+
class NavigationErrorException(val error: NavigationError) : Exception(error.message)
|
|
1666
|
+
|
|
1667
|
+
/**
|
|
1668
|
+
* The built-in display copy for a navigation error, and the fallback when the app's is unusable.
|
|
1669
|
+
*/
|
|
1670
|
+
internal fun defaultFormattedError(error: NavigationError): FormattedNavigationError {
|
|
1671
|
+
val title =
|
|
1672
|
+
when (error.code) {
|
|
1673
|
+
NavigationErrorType.CONTENT_NOT_FOUND -> "Content Not Found"
|
|
1674
|
+
NavigationErrorType.NETWORK_ERROR -> "Network Error"
|
|
1675
|
+
NavigationErrorType.HTTP_ERROR -> {
|
|
1676
|
+
// Use system-localized HTTP status text (e.g., "Not Found", "Service Unavailable")
|
|
1677
|
+
error.statusCode?.let { httpStatusText(it.toInt()) } ?: "Server Error"
|
|
1678
|
+
}
|
|
1679
|
+
NavigationErrorType.CALLBACK_ERROR -> "Error"
|
|
1680
|
+
NavigationErrorType.UNKNOWN_ERROR -> "Error"
|
|
1681
|
+
// Not a failure — a container that resolved with no children. Neutral copy. See ADR 0001.
|
|
1682
|
+
NavigationErrorType.EMPTY_CONTENT -> "Nothing here"
|
|
1683
|
+
NavigationErrorType.TIMEOUT -> "Couldn't load"
|
|
1684
|
+
}
|
|
1685
|
+
// Omit an empty message so it renders as title-only (e.g. the empty-content case).
|
|
1686
|
+
return FormattedNavigationError(title, error.message.takeIf { it.isNotEmpty() })
|
|
1687
|
+
}
|
|
1688
|
+
|
|
1689
|
+
/**
|
|
1690
|
+
* The formatter hop's fallback rule: the app's answer when it produces one, [default] when it
|
|
1691
|
+
* answers null, throws, or outruns [FORMATTER_TIMEOUT]. Kept off the JS edge so the rule is
|
|
1692
|
+
* exercisable without a Nitro Promise.
|
|
1693
|
+
*
|
|
1694
|
+
* The hop runs in [scope] and is awaited through its [kotlinx.coroutines.Deferred], because Nitro's
|
|
1695
|
+
* `Promise.await` parks in a plain `suspendCoroutine`: cancelling it does not unpark it. Awaiting
|
|
1696
|
+
* the Deferred is cancellable, so the timeout leaves the orphan to finish unobserved instead of
|
|
1697
|
+
* holding the caller open until JS answers — which for a browse serve would be forever.
|
|
1698
|
+
*/
|
|
1699
|
+
internal suspend fun formattedOrDefault(
|
|
1700
|
+
scope: CoroutineScope,
|
|
1701
|
+
default: FormattedNavigationError,
|
|
1702
|
+
format: suspend () -> FormattedNavigationError?,
|
|
1703
|
+
): FormattedNavigationError {
|
|
1704
|
+
val hop = scope.async { runCatching { format() }.getOrNull() }
|
|
1705
|
+
return withTimeoutOrNull(FORMATTER_TIMEOUT) { hop.await() } ?: default
|
|
1706
|
+
}
|
|
1707
|
+
|
|
1708
|
+
/** Returns localized HTTP status text for the given status code */
|
|
1709
|
+
private fun httpStatusText(statusCode: Int): String {
|
|
1710
|
+
return when (statusCode) {
|
|
1711
|
+
400 -> "Bad Request"
|
|
1712
|
+
401 -> "Unauthorized"
|
|
1713
|
+
403 -> "Forbidden"
|
|
1714
|
+
404 -> "Not Found"
|
|
1715
|
+
405 -> "Method Not Allowed"
|
|
1716
|
+
408 -> "Request Timeout"
|
|
1717
|
+
429 -> "Too Many Requests"
|
|
1718
|
+
500 -> "Internal Server Error"
|
|
1719
|
+
502 -> "Bad Gateway"
|
|
1720
|
+
503 -> "Service Unavailable"
|
|
1721
|
+
504 -> "Gateway Timeout"
|
|
1722
|
+
else -> "Server Error"
|
|
1723
|
+
}
|
|
1724
|
+
}
|