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