react-native-audio-browser 0.2.0-next.4 → 0.2.0-next.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -22
- package/android/build.gradle +42 -15
- package/android/gradle.properties +2 -2
- package/android/src/main/AndroidManifest.xml +3 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +543 -280
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +38 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +18 -2
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +131 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +41 -11
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +315 -213
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +31 -23
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +288 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +97 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +70 -29
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +20 -3
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +4 -5
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +24 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +10 -6
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +7 -0
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +12 -12
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +111 -58
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +77 -0
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +63 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +34 -12
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +530 -230
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +218 -252
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +23 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +26 -14
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +113 -78
- package/android/src/main/java/com/audiobrowser/player/Player.kt +130 -63
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +12 -4
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +67 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +168 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +35 -7
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +278 -59
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +62 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +56 -52
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +152 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +159 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -34
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +346 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +70 -5
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +301 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -55
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +160 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +385 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +101 -58
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +45 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +3 -4
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +48 -16
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +92 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +192 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +197 -7
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +325 -4
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +83 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +55 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +162 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/ios/AVPlayerEngine.swift +362 -0
- package/ios/AVPlayerEngineCallbacks.swift +14 -0
- package/ios/Browser/BrowseGate.swift +58 -0
- package/ios/Browser/BrowserConfig.swift +115 -81
- package/ios/Browser/BrowserError.swift +16 -0
- package/ios/Browser/BrowserManager.swift +155 -654
- package/ios/Browser/BrowserPathHelper.swift +68 -51
- package/ios/Browser/FavoriteSet.swift +46 -0
- package/ios/Browser/InertStyleDiagnostic.swift +296 -0
- package/ios/Browser/JsonModels.swift +270 -321
- package/ios/Browser/NavigationErrorState.swift +41 -0
- package/ios/Browser/PageResolver.swift +147 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +303 -0
- package/ios/Browser/SearchDrillIn.swift +7 -7
- package/ios/Browser/SectionScope.swift +82 -23
- package/ios/Browser/SimpleRouter.swift +73 -144
- package/ios/Browser/StyleResolver.swift +58 -0
- package/ios/Browser/TabBarEntries.swift +9 -3
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +93 -43
- package/ios/CarPlay/CarPlayArtworkResolver.swift +36 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +91 -163
- package/ios/CarPlay/CarPlayListItemFactory.swift +288 -102
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +137 -177
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +91 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +192 -0
- package/ios/CarPlay/CarPlaySession.swift +207 -0
- package/ios/CarPlay/CarPlayTemplates.swift +63 -0
- package/ios/CarPlay/IntentHandlers.swift +96 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +105 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +21 -25
- package/ios/CarPlay/MediaIntentPlayback.swift +74 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +35 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +77 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +96 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/NavigationError+Conversion.swift +14 -4
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +13 -15
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +29 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -4
- package/ios/Extension/Track+AVPlayer.swift +0 -16
- package/ios/Extension/Track+Copying.swift +11 -13
- package/ios/Extension/Track+Identity.swift +25 -0
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Http/HttpClient.swift +71 -165
- package/ios/HybridAudioBrowser+Browser.swift +136 -0
- package/ios/HybridAudioBrowser+Options.swift +105 -0
- package/ios/HybridAudioBrowser+Player.swift +341 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +157 -0
- package/ios/HybridAudioBrowser+Stubs.swift +46 -0
- package/ios/HybridAudioBrowser.swift +132 -1652
- package/ios/Model/NitroTypeStubs.swift +239 -24
- package/ios/Model/PlayerUpdateOptions.swift +10 -1
- package/ios/Model/RemoteCommand.swift +6 -60
- package/ios/Model/TrackPlayerError.swift +2 -2
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +18 -53
- package/ios/Observer/ItemObserver.swift +90 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +42 -92
- package/ios/Player/AudioSessionController.swift +191 -0
- package/ios/Player/DeferredSeek.swift +70 -0
- package/ios/Player/ErrorStatus.swift +50 -0
- package/ios/Player/MediaLoader.swift +66 -87
- package/ios/Player/NowPlayingLines.swift +36 -0
- package/ios/Player/NowPlayingUpdater.swift +180 -85
- package/ios/Player/PlaybackFailure.swift +125 -0
- package/ios/Player/PlaybackPersistence.swift +73 -0
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/Player.swift +960 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +104 -0
- package/ios/Player/PlayerStatusTypes.swift +2 -6
- package/ios/Player/QueueManager.swift +93 -67
- package/ios/Player/RetryLoop.swift +291 -0
- package/ios/Player/ShuffleOrder.swift +33 -0
- package/ios/Player/SleepTimerManager.swift +14 -16
- package/ios/Player/VolumeFader.swift +5 -0
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +43 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +100 -333
- package/ios/Tests/BrowserPathHelperTests.swift +89 -15
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/DeferredSeekTests.swift +70 -0
- package/ios/Tests/EmitterTests.swift +22 -38
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +60 -0
- package/ios/Tests/GenerationMemoTests.swift +121 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +209 -0
- package/ios/Tests/JsonModelsTests.swift +194 -1
- package/ios/Tests/LRUCacheTests.swift +110 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +57 -46
- package/ios/Tests/MediaLoaderTests.swift +36 -67
- package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
- package/ios/Tests/NowPlayingLinesTests.swift +43 -0
- package/ios/Tests/ObserverTests.swift +88 -0
- package/ios/Tests/PlaybackErrorTests.swift +76 -0
- package/ios/Tests/PlaybackFailureTests.swift +189 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +93 -0
- package/ios/Tests/PlayerPolicyTests.swift +460 -0
- package/ios/Tests/{PlaybackCoordinatorTests.swift → PlayerTests.swift} +489 -311
- package/ios/Tests/PlayingStateTests.swift +42 -0
- package/ios/Tests/QueueManagerTests.swift +196 -115
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +181 -0
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -35
- package/ios/Tests/RetryLoopTests.swift +305 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +98 -0
- package/ios/Tests/SectionScopeTests.swift +139 -54
- package/ios/Tests/SimpleRouterTests.swift +38 -3
- package/ios/Tests/SleepTimerManagerTests.swift +65 -41
- package/ios/Tests/StyleResolverTests.swift +132 -0
- package/ios/Tests/Support/TestTypes.swift +146 -101
- package/ios/Tests/TabBarEntriesTests.swift +19 -19
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +42 -0
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +62 -65
- package/ios/Util/ArtworkImageFetcher.swift +58 -1
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Emitter.swift +40 -12
- package/ios/Util/GenerationMemo.swift +36 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +32 -32
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +56 -0
- package/ios/Util/SFSymbolRenderer.swift +59 -31
- package/ios/Util/SVGProcessor.swift +9 -12
- package/lib/commonjs/AudioBrowser.js +8 -8
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +52 -0
- package/lib/commonjs/features/browser-config.js +12 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +11 -3
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +1 -1
- package/lib/commonjs/features/equalizer.js +1 -1
- package/lib/commonjs/features/errors.js +3 -3
- package/lib/commonjs/features/favorites.js +14 -11
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +16 -1
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +20 -3
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +1 -1
- package/lib/commonjs/features/nowPlaying.js +1 -1
- package/lib/commonjs/features/output.js +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +1 -1
- package/lib/commonjs/features/playback/playing.js +1 -1
- package/lib/commonjs/features/playback/progress.js +3 -2
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -4
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +0 -6
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +1 -1
- package/lib/commonjs/features/player/options.js +48 -34
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +18 -9
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +23 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -0
- package/lib/commonjs/features/queue/activeTrack.js +15 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +13 -6
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +1 -1
- package/lib/commonjs/features/queue/shuffle.js +1 -1
- package/lib/commonjs/features/remoteControls.js +13 -92
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +13 -1
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
- package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
- package/lib/commonjs/utils/LazyNativeEmitter.js +28 -14
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +202 -77
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/Player.js +254 -39
- package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +33 -12
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +175 -100
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +18 -23
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
- package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +62 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -1
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +52 -0
- package/lib/module/features/browser-config.js +12 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +11 -3
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +1 -1
- package/lib/module/features/equalizer.js +1 -1
- package/lib/module/features/errors.js +3 -3
- package/lib/module/features/favorites.js +14 -11
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +16 -1
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +20 -3
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +1 -1
- package/lib/module/features/nowPlaying.js +1 -1
- package/lib/module/features/output.js +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +1 -1
- package/lib/module/features/playback/playing.js +1 -1
- package/lib/module/features/playback/progress.js +3 -2
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -4
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +0 -5
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +1 -1
- package/lib/module/features/player/options.js +47 -32
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +17 -8
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +19 -0
- package/lib/module/features/player/validateOptions.js.map +1 -0
- package/lib/module/features/queue/activeTrack.js +15 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +13 -6
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +1 -1
- package/lib/module/features/queue/shuffle.js +1 -1
- package/lib/module/features/remoteControls.js +13 -92
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +13 -1
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/test-utils/reactNativeStub.js +58 -0
- package/lib/module/test-utils/reactNativeStub.js.map +1 -0
- package/lib/module/utils/LazyNativeEmitter.js +28 -14
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +202 -77
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
- package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/module/web/TrackPlayer/Player.js +254 -39
- package/lib/module/web/TrackPlayer/Player.js.map +1 -1
- package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueuePlayer.js +33 -12
- package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +175 -100
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/NavigationErrorManager.js +3 -1
- package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +18 -23
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/http/RequestConfigBuilder.js +110 -27
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/http/followMediaRedirect.js +215 -0
- package/lib/module/web/http/followMediaRedirect.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +62 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/package.json +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts +1 -1
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +10 -2
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +1 -1
- package/lib/typescript/src/features/errors.d.ts +3 -3
- package/lib/typescript/src/features/favorites.d.ts +14 -11
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +18 -2
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +20 -3
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
- package/lib/typescript/src/features/output.d.ts +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +3 -4
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +1 -1
- package/lib/typescript/src/features/player/options.d.ts +108 -56
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +14 -4
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
- package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +7 -4
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +23 -22
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
- package/lib/typescript/src/types/browser-native.d.ts +3 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +387 -126
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +93 -61
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +19 -16
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
- package/lib/typescript/src/utils/resolveAssetSource.d.ts.map +1 -1
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +1 -2
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
- package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidOptions.hpp +12 -12
- package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
- package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
- package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +9 -12
- package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
- package/nitrogen/generated/android/c++/JGate.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
- package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +77 -53
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +3 -3
- package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
- package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +17 -14
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +9 -12
- package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
- package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +12 -12
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
- package/nitrogen/generated/android/c++/JOptions.hpp +9 -12
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
- package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
- package/nitrogen/generated/android/c++/{JNotificationButton.hpp → JRemoteButton.hpp} +19 -19
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +86 -0
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
- package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JSection.hpp +116 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
- package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
- package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
- package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
- package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +18 -12
- package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.cpp +26 -0
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +75 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
- package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +20 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +3 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +20 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{NotificationButton.kt → RemoteButton.kt} +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +61 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{Variant_NullType_NotificationButtonLayout.kt → Variant_NullType_RemoteButtonLayout.kt} +24 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
- package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +779 -665
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +34 -16
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +36 -18
- package/nitrogen/generated/ios/swift/AndroidOptions.swift +12 -12
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
- package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroAndroidUpdateOptions.swift +12 -12
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/{NotificationButton.swift → RemoteButton.swift} +6 -6
- package/nitrogen/generated/ios/swift/RemoteButtonLayout.swift +57 -0
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
- package/nitrogen/generated/ios/swift/Section.swift +82 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
- package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +28 -63
- package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
- package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +30 -0
- package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
- package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
- package/nitrogen/generated/shared/c++/AndroidOptions.hpp +8 -8
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
- package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
- package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroAndroidUpdateOptions.hpp +8 -8
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/{NotificationButton.hpp → RemoteButton.hpp} +19 -19
- package/nitrogen/generated/shared/c++/RemoteButtonLayout.hpp +94 -0
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
- package/nitrogen/generated/shared/c++/Section.hpp +102 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +18 -30
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
- package/package.json +24 -11
- package/src/AudioBrowser.ts +2 -1
- package/src/CLAUDE.md +52 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +12 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +11 -3
- package/src/features/carConnection.ts +1 -1
- package/src/features/equalizer.ts +1 -1
- package/src/features/errors.ts +3 -3
- package/src/features/favorites.ts +14 -11
- package/src/features/gate.ts +16 -1
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +20 -3
- package/src/features/network.ts +1 -1
- package/src/features/nowPlaying.ts +1 -1
- package/src/features/output.ts +1 -1
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/playWhenReady.ts +1 -1
- package/src/features/playback/playing.ts +1 -1
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +3 -2
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +3 -4
- package/src/features/playback/trackPlaybackTime.test.ts +16 -6
- package/src/features/playback/trackPlaybackTime.ts +1 -6
- package/src/features/playback/volume.ts +1 -1
- package/src/features/player/options.ts +126 -76
- package/src/features/player/setup.test.ts +24 -7
- package/src/features/player/setup.ts +22 -10
- package/src/features/player/validateOptions.ts +21 -0
- package/src/features/queue/activeTrack.ts +15 -4
- package/src/features/queue/queue.ts +13 -6
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +1 -1
- package/src/features/remoteControls.ts +13 -92
- package/src/features/sleepTimer.test.ts +172 -0
- package/src/features/sleepTimer.ts +9 -1
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +147 -0
- package/src/specs/audio-browser.nitro.ts +5 -4
- package/src/style-resolution.test.ts +210 -0
- package/src/test-utils/reactNativeStub.ts +60 -0
- package/src/types/browser-native.ts +7 -3
- package/src/types/browser-nodes.ts +403 -134
- package/src/types/browser.ts +97 -63
- package/src/utils/LazyNativeEmitter.ts +28 -15
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useNativeUpdatedValue.test.ts +103 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +241 -84
- package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
- package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
- package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
- package/src/web/TrackPlayer/Player.dispatch.test.ts +5 -3
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +284 -37
- package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
- package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/src/web/TrackPlayer/QueuePlayer.ts +33 -14
- package/src/web/__tests__/lifecycle.test.ts +345 -0
- package/src/web/__tests__/lifecycleHarness.ts +351 -0
- package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
- package/src/web/__tests__/loadSupersession.test.ts +175 -0
- package/src/web/__tests__/retry.test.ts +169 -0
- package/src/web/browser/BrowserManager.ts +209 -111
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/NavigationErrorManager.ts +3 -1
- package/src/web/browser/SearchManager.test.ts +75 -0
- package/src/web/browser/SearchManager.ts +25 -28
- package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
- package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
- package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/http/RequestConfigBuilder.test.ts +241 -1
- package/src/web/http/RequestConfigBuilder.ts +140 -33
- package/src/web/http/followMediaRedirect.test.ts +289 -0
- package/src/web/http/followMediaRedirect.ts +253 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +68 -0
- package/src/web/util/BrowserPathHelper.ts +70 -13
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +135 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +587 -0
- package/website/guide/carplay.md +650 -0
- package/website/guide/configuration.md +173 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +247 -0
- package/ios/Bridge.h +0 -8
- package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
- package/ios/Browser/MediaResolveComposer.swift +0 -114
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
- package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
- package/ios/Model/MediaURL.swift +0 -67
- package/ios/Model/SourceType.swift +0 -6
- package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
- package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
- package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
- package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
- package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
- package/ios/Observer/PlayerStateObserver.swift +0 -50
- package/ios/Observer/PlayerTimeObserver.swift +0 -55
- package/ios/Option/PitchAlgorithms.swift +0 -17
- package/ios/Option/TimeEventFrequency.swift +0 -18
- package/ios/Player/LoadSeekCoordinator.swift +0 -99
- package/ios/Player/MediaIntentCriteria.swift +0 -139
- package/ios/Player/MediaLoaderDelegate.swift +0 -11
- package/ios/Player/PlaybackCoordinator.swift +0 -754
- package/ios/Player/PlaybackEffectHandler.swift +0 -54
- package/ios/Player/PlaybackErrorHandler.swift +0 -175
- package/ios/Player/PlaybackStateStore.swift +0 -27
- package/ios/Player/PlayingStateManager.swift +0 -33
- package/ios/Player/RetryManager.swift +0 -322
- package/ios/Player/SeekCompletionHandler.swift +0 -3
- package/ios/Player/SleepTimerHandling.swift +0 -15
- package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
- package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -325
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -86
- package/ios/Util/MetadataAdapter.swift +0 -131
- package/ios/Util/OnceValue.swift +0 -104
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JNotificationButtonLayout.hpp +0 -94
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.hpp +0 -75
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NotificationButtonLayout.kt +0 -50
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/NotificationButtonLayout.swift +0 -92
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/ios/swift/Variant_NullType_NotificationButtonLayout.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
- package/nitrogen/generated/shared/c++/NotificationButtonLayout.hpp +0 -102
|
@@ -20,6 +20,7 @@ import com.audiobrowser.browser.displayArtworkSource
|
|
|
20
20
|
import com.audiobrowser.browser.resolveArtworkUrl
|
|
21
21
|
import com.audiobrowser.browser.unattributedArtworkSource
|
|
22
22
|
import com.audiobrowser.extension.NumberExt.Companion.toSeconds
|
|
23
|
+
import com.audiobrowser.extension.identity
|
|
23
24
|
import com.audiobrowser.model.PlayerSetupOptions
|
|
24
25
|
import com.audiobrowser.model.PlayerUpdateOptions
|
|
25
26
|
import com.audiobrowser.util.CoilBitmapLoader
|
|
@@ -36,7 +37,6 @@ import com.margelo.nitro.audiobrowser.ImageSource
|
|
|
36
37
|
import com.margelo.nitro.audiobrowser.NativeGateRequest
|
|
37
38
|
import com.margelo.nitro.audiobrowser.NowPlayingMetadata
|
|
38
39
|
import com.margelo.nitro.audiobrowser.Playback
|
|
39
|
-
import com.margelo.nitro.audiobrowser.PlaybackActiveTrackChangedEvent
|
|
40
40
|
import com.margelo.nitro.audiobrowser.PlaybackError
|
|
41
41
|
import com.margelo.nitro.audiobrowser.PlaybackPlayWhenReadyChangedEvent
|
|
42
42
|
import com.margelo.nitro.audiobrowser.PlaybackProgressUpdatedEvent
|
|
@@ -127,6 +127,9 @@ class Player(internal val context: Context) {
|
|
|
127
127
|
*/
|
|
128
128
|
var imageLoader: coil3.ImageLoader? = null
|
|
129
129
|
|
|
130
|
+
/** Called on the main thread when a resumption meant to start playback fails. Set by Service. */
|
|
131
|
+
var onPlaybackResumptionFailed: () -> Unit = {}
|
|
132
|
+
|
|
130
133
|
/** Registry that maps content:// tokens to artwork URLs for the browse content provider. */
|
|
131
134
|
val browseArtworkRegistry = com.audiobrowser.browser.BrowseArtworkRegistry()
|
|
132
135
|
|
|
@@ -168,13 +171,26 @@ class Player(internal val context: Context) {
|
|
|
168
171
|
mediaSessionCallback.updateMediaSession(
|
|
169
172
|
mediaSession,
|
|
170
173
|
options.capabilities,
|
|
171
|
-
options.
|
|
174
|
+
options.remoteButtonLayout,
|
|
172
175
|
searchAvailable,
|
|
176
|
+
options.forwardJumpInterval,
|
|
177
|
+
options.backwardJumpInterval,
|
|
173
178
|
)
|
|
174
179
|
}
|
|
175
180
|
}
|
|
176
181
|
}
|
|
177
182
|
|
|
183
|
+
/**
|
|
184
|
+
* Drops a completed browser registration so [awaitBrowser] waits for the replacement instead of
|
|
185
|
+
* handing out the disposed browser. A [CompletableDeferred] completes once, so it would otherwise
|
|
186
|
+
* pin the first browser for the life of the process.
|
|
187
|
+
*/
|
|
188
|
+
fun forgetBrowserRegistration() {
|
|
189
|
+
if (browserRegistered.isCompleted) {
|
|
190
|
+
browserRegistered = CompletableDeferred()
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
178
194
|
/**
|
|
179
195
|
* Suspends until the browser is registered, with a timeout.
|
|
180
196
|
*
|
|
@@ -241,13 +257,12 @@ class Player(internal val context: Context) {
|
|
|
241
257
|
}
|
|
242
258
|
|
|
243
259
|
/**
|
|
244
|
-
* Re-derives [playingState] from the current
|
|
245
|
-
* `onPlaybackPlayingState` when it changed. The only writer of [playingState]
|
|
246
|
-
*
|
|
247
|
-
* points of its two inputs.
|
|
260
|
+
* Re-derives [playingState] from the current [shouldPlayWhenReady] + [playbackState] and emits
|
|
261
|
+
* `onPlaybackPlayingState` when it changed. The only writer of [playingState], called at every
|
|
262
|
+
* change point of its inputs.
|
|
248
263
|
*/
|
|
249
264
|
internal fun refreshPlayingState() {
|
|
250
|
-
val newPlayingState = PlayingStateFactory.derive(
|
|
265
|
+
val newPlayingState = PlayingStateFactory.derive(shouldPlayWhenReady, playbackState)
|
|
251
266
|
if (newPlayingState == playingState) return
|
|
252
267
|
Timber.d(
|
|
253
268
|
"PlayingState changed: playing=${newPlayingState.playing}, buffering=${newPlayingState.buffering}"
|
|
@@ -299,6 +314,15 @@ class Player(internal val context: Context) {
|
|
|
299
314
|
val isPlaying
|
|
300
315
|
get() = exoPlayer.isPlaying
|
|
301
316
|
|
|
317
|
+
/**
|
|
318
|
+
* False while ExoPlayer suppresses output (a transient audio focus loss) though [playWhenReady]
|
|
319
|
+
* stays raised for it to resume on; mirrors media3's `ExoPlayerImplInternal.shouldPlayWhenReady`.
|
|
320
|
+
*/
|
|
321
|
+
internal val shouldPlayWhenReady
|
|
322
|
+
get() =
|
|
323
|
+
exoPlayer.playWhenReady &&
|
|
324
|
+
exoPlayer.playbackSuppressionReason == ExoPlayer.PLAYBACK_SUPPRESSION_REASON_NONE
|
|
325
|
+
|
|
302
326
|
var repeatMode: RepeatMode
|
|
303
327
|
get() = RepeatModeFactory.fromMedia3(exoPlayer.repeatMode)
|
|
304
328
|
internal set(value) {
|
|
@@ -338,7 +362,7 @@ class Player(internal val context: Context) {
|
|
|
338
362
|
get() = exoPlayer.nextMediaItemIndex == C.INDEX_UNSET
|
|
339
363
|
|
|
340
364
|
/**
|
|
341
|
-
* The source path from which the current queue was expanded (e.g., from a contextual
|
|
365
|
+
* The source path from which the current queue was expanded (e.g., from a contextual path). Used
|
|
342
366
|
* to avoid re-expanding the queue when selecting tracks from the same source.
|
|
343
367
|
*/
|
|
344
368
|
var queueSourcePath: String? = null
|
|
@@ -365,20 +389,28 @@ class Player(internal val context: Context) {
|
|
|
365
389
|
exoPlayer.skipSilenceEnabled = value
|
|
366
390
|
}
|
|
367
391
|
|
|
392
|
+
private var engineOptions: PlayerSetupOptions? = null
|
|
393
|
+
|
|
368
394
|
/**
|
|
369
|
-
*
|
|
370
|
-
*
|
|
395
|
+
* Applies [setupOptions]: builds the ExoPlayer on the first call, and rebuilds it only when the
|
|
396
|
+
* engine options differ from the ones it was built with. A rebuild carries over the queue, the
|
|
397
|
+
* position and the play intent, so playback that has started goes on with the new engine.
|
|
371
398
|
*/
|
|
372
399
|
fun setup(setupOptions: PlayerSetupOptions) {
|
|
373
|
-
Timber.Forest.d("Setting up player with new options")
|
|
374
|
-
|
|
375
400
|
nowPlaying.enabled = setupOptions.autoUpdateNowPlayingMetadata
|
|
376
401
|
// Wrap the Nitro Func into a plain suspend call so the updater (and its tests) never touch
|
|
377
402
|
// bridge types; the double-await depth is unchanged (invoke -> bridge Promise -> JS promise).
|
|
378
403
|
nowPlaying.formatter =
|
|
379
404
|
setupOptions.nowPlayingMetadataFormatter?.let { f -> { params -> f.invoke(params).await() } }
|
|
380
405
|
|
|
381
|
-
val
|
|
406
|
+
val newEngineOptions = setupOptions.engineOptions()
|
|
407
|
+
if (newEngineOptions == engineOptions) {
|
|
408
|
+
Timber.Forest.d("Setup options unchanged: keeping the player")
|
|
409
|
+
return
|
|
410
|
+
}
|
|
411
|
+
Timber.Forest.d("Setting up player with new options")
|
|
412
|
+
val isInitialSetup = engineOptions == null
|
|
413
|
+
val carried = if (isInitialSetup) null else EnginePlayback.of(exoPlayer)
|
|
382
414
|
|
|
383
415
|
if (!isInitialSetup) {
|
|
384
416
|
forwardingPlayer.removeListener(playerListener)
|
|
@@ -421,19 +453,13 @@ class Player(internal val context: Context) {
|
|
|
421
453
|
}
|
|
422
454
|
reportRetryingError(exception)
|
|
423
455
|
},
|
|
424
|
-
resolveMediaConfig = { url -> browser?.getMediaRequestConfig(url) },
|
|
456
|
+
resolveMediaConfig = { url, track -> browser?.getMediaRequestConfig(url, track) },
|
|
425
457
|
)
|
|
426
458
|
loadControl = engine.loadControl
|
|
427
459
|
mediaFactory = engine.mediaFactory
|
|
428
460
|
exoPlayer = engine.exoPlayer
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
// eager cache and tell JS, or the stale true sticks (and the emit dedupe
|
|
432
|
-
// would swallow the next real rise).
|
|
433
|
-
if (!isInitialSetup) {
|
|
434
|
-
playWhenReadyCache = false
|
|
435
|
-
emitPlayWhenReadyChanged(false)
|
|
436
|
-
}
|
|
461
|
+
// Before the listener and the session are attached, so neither hears the playback replayed.
|
|
462
|
+
carried?.restoreTo(exoPlayer)
|
|
437
463
|
|
|
438
464
|
// Recreate forwarding player with new ExoPlayer
|
|
439
465
|
forwardingPlayer =
|
|
@@ -462,11 +488,20 @@ class Player(internal val context: Context) {
|
|
|
462
488
|
mediaSession.player = forwardingPlayer
|
|
463
489
|
}
|
|
464
490
|
|
|
465
|
-
|
|
491
|
+
// No listener heard the restore; its prepare() leaves the engine buffering.
|
|
492
|
+
setPlaybackState(
|
|
493
|
+
if (exoPlayer.playbackState == ExoPlayer.STATE_IDLE) PlaybackState.NONE
|
|
494
|
+
else PlaybackState.BUFFERING
|
|
495
|
+
)
|
|
496
|
+
// The new engine can refuse the carried intent (audio focus denied) without a change event:
|
|
497
|
+
// sync the eager cache and tell JS, or a stale true sticks.
|
|
498
|
+
playWhenReadyCache = exoPlayer.playWhenReady
|
|
499
|
+
emitPlayWhenReadyChanged(exoPlayer.playWhenReady)
|
|
466
500
|
}
|
|
467
501
|
|
|
468
502
|
// Set up automatic buffer management if enabled
|
|
469
503
|
setupAutomaticBufferManager(setupOptions.automaticBuffer)
|
|
504
|
+
engineOptions = newEngineOptions
|
|
470
505
|
}
|
|
471
506
|
|
|
472
507
|
/** Sets up or tears down the automatic buffer manager based on the enabled flag. */
|
|
@@ -644,7 +679,7 @@ class Player(internal val context: Context) {
|
|
|
644
679
|
* @param tracks The tracks to set as the new queue.
|
|
645
680
|
* @param startIndex The index to start playback from (default: 0).
|
|
646
681
|
* @param startPositionMs The position in milliseconds to start from (default: 0).
|
|
647
|
-
* @param sourcePath Optional path from which this queue was expanded (for contextual
|
|
682
|
+
* @param sourcePath Optional path from which this queue was expanded (for contextual path
|
|
648
683
|
* optimization).
|
|
649
684
|
*/
|
|
650
685
|
fun setQueue(
|
|
@@ -655,6 +690,9 @@ class Player(internal val context: Context) {
|
|
|
655
690
|
) {
|
|
656
691
|
val mediaItems = TrackFactory.toMedia3(tracks).toMutableList()
|
|
657
692
|
exoPlayer.setMediaItems(mediaItems, startIndex, startPositionMs)
|
|
693
|
+
if (mediaItems.isNotEmpty()) {
|
|
694
|
+
exoPlayer.setShuffleOrder(shuffleOrderLedBy(startIndex, mediaItems.size))
|
|
695
|
+
}
|
|
658
696
|
queueSourcePath = sourcePath
|
|
659
697
|
exoPlayer.prepare()
|
|
660
698
|
}
|
|
@@ -672,17 +710,27 @@ class Player(internal val context: Context) {
|
|
|
672
710
|
/**
|
|
673
711
|
* Sets the favorited state of the currently playing track. Updates the heart icon in media
|
|
674
712
|
* controllers without interrupting playback.
|
|
713
|
+
*
|
|
714
|
+
* @return whether the gesture applied — false only when there is no current track (nothing to
|
|
715
|
+
* favorite), so MediaSession callers can report an invalid state instead of a success the
|
|
716
|
+
* controller then watches revert.
|
|
675
717
|
*/
|
|
676
|
-
fun setActiveTrackFavorited(favorited: Boolean) {
|
|
677
|
-
val currentTrack = this.currentTrack ?: return
|
|
718
|
+
fun setActiveTrackFavorited(favorited: Boolean): Boolean {
|
|
719
|
+
val currentTrack = this.currentTrack ?: return false
|
|
678
720
|
|
|
679
721
|
// Persist to the native favorites cache regardless of player state — the
|
|
680
722
|
// user's gesture is durable even when there's no active media item to
|
|
681
|
-
// update (queue tear-down, between-track gaps, etc.).
|
|
682
|
-
|
|
723
|
+
// update (queue tear-down, between-track gaps, etc.). Keyed by the track
|
|
724
|
+
// identity (id when non-blank, else src).
|
|
725
|
+
currentTrack.identity?.let { identity ->
|
|
726
|
+
browser?.browserManager?.updateFavorite(identity, favorited)
|
|
727
|
+
}
|
|
683
728
|
|
|
729
|
+
// Cache written above: the gesture is durably recorded even without a media
|
|
730
|
+
// item to restamp (queue tear-down, between-track gaps) — that counts as
|
|
731
|
+
// applied; there is also no visible heart to revert in that state.
|
|
684
732
|
val index = exoPlayer.currentMediaItemIndex
|
|
685
|
-
if (index == C.INDEX_UNSET) return
|
|
733
|
+
if (index == C.INDEX_UNSET) return true
|
|
686
734
|
|
|
687
735
|
// Create updated Track with new favorited state
|
|
688
736
|
val updatedTrack = currentTrack.copy(favorited = favorited)
|
|
@@ -706,28 +754,23 @@ class Player(internal val context: Context) {
|
|
|
706
754
|
// Update the heart button icon in notification/Android Auto
|
|
707
755
|
updateFavoriteButtonState(favorited)
|
|
708
756
|
|
|
709
|
-
// Notify JS of the favorite state change
|
|
757
|
+
// Notify JS of the favorite state change. This is the ONLY emit: a favorite
|
|
758
|
+
// toggle is an in-place mutation of the active track, not a transition —
|
|
759
|
+
// onPlaybackActiveTrackChanged / onPlaybackQueueChanged stay
|
|
760
|
+
// transition-only, and the useActiveTrack / useQueue hooks subscribe to
|
|
761
|
+
// onFavoriteChanged themselves.
|
|
710
762
|
callbacks?.onFavoriteChanged(FavoriteChangedEvent(updatedTrack, favorited))
|
|
711
|
-
|
|
712
|
-
// Emit active track changed so useActiveTrack() hook updates
|
|
713
|
-
val activeTrackEvent =
|
|
714
|
-
PlaybackActiveTrackChangedEvent(
|
|
715
|
-
lastIndex = index.toDouble(),
|
|
716
|
-
lastTrack = currentTrack,
|
|
717
|
-
lastPosition = exoPlayer.currentPosition.toSeconds(),
|
|
718
|
-
index = index.toDouble(),
|
|
719
|
-
track = updatedTrack,
|
|
720
|
-
)
|
|
721
|
-
callbacks?.onPlaybackActiveTrackChanged(activeTrackEvent)
|
|
722
|
-
|
|
723
|
-
// Emit queue changed so useQueue() hook updates
|
|
724
|
-
callbacks?.onPlaybackQueueChanged(tracks)
|
|
763
|
+
return true
|
|
725
764
|
}
|
|
726
765
|
|
|
727
|
-
/**
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
766
|
+
/**
|
|
767
|
+
* Toggles the favorited state of the currently playing track.
|
|
768
|
+
*
|
|
769
|
+
* @return whether the toggle applied — false when there is no current track.
|
|
770
|
+
*/
|
|
771
|
+
fun toggleActiveTrackFavorited(): Boolean {
|
|
772
|
+
val currentTrack = this.currentTrack ?: return false
|
|
773
|
+
return setActiveTrackFavorited(currentTrack.favorited != true)
|
|
731
774
|
}
|
|
732
775
|
|
|
733
776
|
// MARK: - Now Playing Metadata
|
|
@@ -753,7 +796,7 @@ class Player(internal val context: Context) {
|
|
|
753
796
|
get() = this@Player.playbackError
|
|
754
797
|
|
|
755
798
|
override val playWhenReady
|
|
756
|
-
get() =
|
|
799
|
+
get() = shouldPlayWhenReady
|
|
757
800
|
|
|
758
801
|
override val isRebuffering
|
|
759
802
|
get() = loadControl.isRebuffering
|
|
@@ -834,8 +877,8 @@ class Player(internal val context: Context) {
|
|
|
834
877
|
* A restart from a terminal error begins a new load of the same track: fresh retry budgets and
|
|
835
878
|
* unproven playback, so the user's tap yields a visible first-connect retry window instead of a
|
|
836
879
|
* single silent attempt — the same behavior as re-selecting the track (ADR 0004). Hooked off the
|
|
837
|
-
* player error clearing: every recovery path (retry(), play(), the transport controls'
|
|
838
|
-
*
|
|
880
|
+
* player error clearing: every recovery path (retry(), play(), the transport controls' idle-error
|
|
881
|
+
* recovery) goes through exoPlayer.prepare(), which clears the error.
|
|
839
882
|
*/
|
|
840
883
|
internal fun resetForNewLoad() {
|
|
841
884
|
resetRetryTimer()
|
|
@@ -913,10 +956,23 @@ class Player(internal val context: Context) {
|
|
|
913
956
|
}
|
|
914
957
|
}
|
|
915
958
|
|
|
916
|
-
/**
|
|
959
|
+
/**
|
|
960
|
+
* Jump to the live edge of the current track; no-op unless it declares `live` — the track's own
|
|
961
|
+
* declaration is the gate (matching iOS and the spec), not ExoPlayer's stream-derived liveness,
|
|
962
|
+
* which never marks progressive ICY radio live. A stream with a live window seeks to its edge;
|
|
963
|
+
* anything else reconnects — for a non-seekable stream a fresh connection IS the live edge. A
|
|
964
|
+
* stale URL recovers through the failure-armed re-resolve in [TransformingDataSource].
|
|
965
|
+
*/
|
|
917
966
|
fun seekToLiveEdge() {
|
|
967
|
+
if (currentTrack?.live != true) return
|
|
918
968
|
if (exoPlayer.isCurrentMediaItemLive) {
|
|
919
969
|
exoPlayer.seekToDefaultPosition()
|
|
970
|
+
} else {
|
|
971
|
+
// ExoPlayer.prepare() only re-prepares from STATE_IDLE, hence the raw stop() — not
|
|
972
|
+
// Player.stop(), which would drop the play intent this reconnect must preserve.
|
|
973
|
+
exoPlayer.stop()
|
|
974
|
+
exoPlayer.seekToDefaultPosition()
|
|
975
|
+
exoPlayer.prepare()
|
|
920
976
|
}
|
|
921
977
|
}
|
|
922
978
|
|
|
@@ -978,10 +1034,12 @@ class Player(internal val context: Context) {
|
|
|
978
1034
|
}
|
|
979
1035
|
|
|
980
1036
|
fun togglePlayback() {
|
|
981
|
-
|
|
982
|
-
pause()
|
|
983
|
-
|
|
984
|
-
|
|
1037
|
+
when {
|
|
1038
|
+
shouldPlayWhenReady -> pause()
|
|
1039
|
+
// Suppressed with the intent raised: ExoPlayer resumes when focus returns. play() would
|
|
1040
|
+
// request focus again, and a call refuses it, which drops the intent.
|
|
1041
|
+
playWhenReady -> Unit
|
|
1042
|
+
else -> play()
|
|
985
1043
|
}
|
|
986
1044
|
}
|
|
987
1045
|
|
|
@@ -1215,8 +1273,8 @@ class Player(internal val context: Context) {
|
|
|
1215
1273
|
val backwardJumpIntervalChanged =
|
|
1216
1274
|
previousOptions.backwardJumpInterval != options.backwardJumpInterval
|
|
1217
1275
|
val capabilitiesChanged = previousOptions.capabilities != options.capabilities
|
|
1218
|
-
val
|
|
1219
|
-
previousOptions.
|
|
1276
|
+
val remoteButtonLayoutChanged =
|
|
1277
|
+
!previousOptions.remoteButtonLayout.sameAs(options.remoteButtonLayout)
|
|
1220
1278
|
val appKilledPlaybackBehaviorChanged =
|
|
1221
1279
|
previousOptions.appKilledPlaybackBehavior != options.appKilledPlaybackBehavior
|
|
1222
1280
|
|
|
@@ -1226,7 +1284,7 @@ class Player(internal val context: Context) {
|
|
|
1226
1284
|
forwardJumpIntervalChanged ||
|
|
1227
1285
|
backwardJumpIntervalChanged ||
|
|
1228
1286
|
capabilitiesChanged ||
|
|
1229
|
-
|
|
1287
|
+
remoteButtonLayoutChanged ||
|
|
1230
1288
|
appKilledPlaybackBehaviorChanged
|
|
1231
1289
|
|
|
1232
1290
|
// Apply only changed properties
|
|
@@ -1236,21 +1294,30 @@ class Player(internal val context: Context) {
|
|
|
1236
1294
|
|
|
1237
1295
|
if (capabilitiesChanged) {
|
|
1238
1296
|
// The `favorite` capability is the single favoriting switch — propagate
|
|
1239
|
-
//
|
|
1240
|
-
browser?.browserManager?.
|
|
1297
|
+
// it to the browser so it can hydrate row hearts.
|
|
1298
|
+
browser?.browserManager?.setFavoriteEnabled(options.capabilities.favoriteEnabled)
|
|
1241
1299
|
}
|
|
1242
1300
|
|
|
1243
1301
|
if (progressUpdateEventIntervalChanged) {
|
|
1244
1302
|
setProgressUpdateInterval(options.progressUpdateEventInterval)
|
|
1245
1303
|
}
|
|
1246
1304
|
|
|
1247
|
-
|
|
1305
|
+
// The jump intervals pick the button icons (ICON_SKIP_BACK_15 and friends), so a changed
|
|
1306
|
+
// interval has to rebuild the layout even when capabilities and placement are untouched.
|
|
1307
|
+
if (
|
|
1308
|
+
capabilitiesChanged ||
|
|
1309
|
+
remoteButtonLayoutChanged ||
|
|
1310
|
+
forwardJumpIntervalChanged ||
|
|
1311
|
+
backwardJumpIntervalChanged
|
|
1312
|
+
) {
|
|
1248
1313
|
val searchAvailable = browser?.browserManager?.config?.hasSearch ?: false
|
|
1249
1314
|
mediaSessionCallback.updateMediaSession(
|
|
1250
1315
|
mediaSession,
|
|
1251
1316
|
options.capabilities,
|
|
1252
|
-
options.
|
|
1317
|
+
options.remoteButtonLayout,
|
|
1253
1318
|
searchAvailable,
|
|
1319
|
+
options.forwardJumpInterval,
|
|
1320
|
+
options.backwardJumpInterval,
|
|
1254
1321
|
)
|
|
1255
1322
|
}
|
|
1256
1323
|
|
|
@@ -1,20 +1,7 @@
|
|
|
1
1
|
package com.audiobrowser.player
|
|
2
2
|
|
|
3
|
-
import com.margelo.nitro.audiobrowser.FavoritesMatchMode
|
|
4
3
|
import com.margelo.nitro.audiobrowser.PlayerCapabilities
|
|
5
4
|
|
|
6
|
-
/**
|
|
7
|
-
* Resolved favorite match mode, or null when favoriting is disabled.
|
|
8
|
-
*
|
|
9
|
-
* `false`/unset → null; `true` → EXACT; `{ match }` → that match.
|
|
10
|
-
*/
|
|
11
|
-
val PlayerCapabilities.favoriteMatch: FavoritesMatchMode?
|
|
12
|
-
get() =
|
|
13
|
-
favorite?.match(
|
|
14
|
-
first = { enabled -> if (enabled) FavoritesMatchMode.EXACT else null },
|
|
15
|
-
second = { config -> config.match },
|
|
16
|
-
)
|
|
17
|
-
|
|
18
|
-
/** Whether the favorite/like control is enabled. */
|
|
5
|
+
/** Whether the favorite/like control is enabled. Opt-in: only an explicit `true` enables it. */
|
|
19
6
|
val PlayerCapabilities.favoriteEnabled: Boolean
|
|
20
|
-
get() =
|
|
7
|
+
get() = favorite == true
|
|
@@ -12,6 +12,7 @@ import com.audiobrowser.model.PlayerSetupOptions
|
|
|
12
12
|
import com.audiobrowser.util.AndroidAudioContentTypeFactory
|
|
13
13
|
import com.margelo.nitro.audiobrowser.AndroidPlayerWakeMode
|
|
14
14
|
import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
15
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
15
16
|
import java.io.IOException
|
|
16
17
|
|
|
17
18
|
// media3's configurable stuck-buffering (type-1, STUCK_BUFFERING_NO_PROGRESS) timeout. Fires only
|
|
@@ -55,7 +56,7 @@ internal fun buildPlayerEngine(
|
|
|
55
56
|
isOnline: () -> Boolean,
|
|
56
57
|
hasPlayed: () -> Boolean,
|
|
57
58
|
onRetryPending: (exception: IOException, isNetworkError: Boolean) -> Unit,
|
|
58
|
-
resolveMediaConfig: (url: String) -> MediaRequestConfig?,
|
|
59
|
+
resolveMediaConfig: (url: String, track: Track) -> MediaRequestConfig?,
|
|
59
60
|
): PlayerEngine {
|
|
60
61
|
val renderer = DefaultRenderersFactory(context)
|
|
61
62
|
renderer.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER)
|
|
@@ -59,7 +59,7 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
// Extract and emit timed metadata (ICY, ID3, etc.)
|
|
62
|
-
PlaybackMetadata.from(metadata)?.let {
|
|
62
|
+
PlaybackMetadata.from(metadata, player.currentTrack?.icyCharset)?.let {
|
|
63
63
|
val timed = it.toNitro()
|
|
64
64
|
player.callbacks?.onTimedMetadata(timed)
|
|
65
65
|
player.nowPlaying.onTimedMetadataReceived(timed)
|
|
@@ -186,6 +186,10 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
186
186
|
}
|
|
187
187
|
}
|
|
188
188
|
|
|
189
|
+
override fun onPlaybackSuppressionReasonChanged(playbackSuppressionReason: Int) {
|
|
190
|
+
player.refreshPlayingState()
|
|
191
|
+
}
|
|
192
|
+
|
|
189
193
|
/**
|
|
190
194
|
* The generic onEvents callback provides access to the Player object and specifies the set of
|
|
191
195
|
* events that occurred together. It's always called after the callbacks that correspond to the
|
|
@@ -211,12 +215,16 @@ class PlayerListener(private val player: Player) : MediaPlayer.Listener {
|
|
|
211
215
|
PlaybackEvent.ExoPlaybackStateChanged(
|
|
212
216
|
player.exoPlayer.playbackState,
|
|
213
217
|
media3Player.mediaItemCount,
|
|
214
|
-
player.
|
|
218
|
+
player.shouldPlayWhenReady,
|
|
215
219
|
)
|
|
216
220
|
MediaPlayer.EVENT_MEDIA_ITEM_TRANSITION ->
|
|
217
221
|
PlaybackEvent.MediaItemTransition(player.currentTrack != null, player.isPlaying)
|
|
218
|
-
MediaPlayer.EVENT_PLAY_WHEN_READY_CHANGED
|
|
219
|
-
|
|
222
|
+
MediaPlayer.EVENT_PLAY_WHEN_READY_CHANGED,
|
|
223
|
+
MediaPlayer.EVENT_PLAYBACK_SUPPRESSION_REASON_CHANGED ->
|
|
224
|
+
PlaybackEvent.ShouldPlayWhenReadyChanged(
|
|
225
|
+
player.shouldPlayWhenReady,
|
|
226
|
+
player.exoPlayer.playbackState,
|
|
227
|
+
)
|
|
220
228
|
MediaPlayer.EVENT_IS_PLAYING_CHANGED -> PlaybackEvent.IsPlayingChanged(player.isPlaying)
|
|
221
229
|
else -> null
|
|
222
230
|
} ?: continue
|
|
@@ -107,7 +107,8 @@ class RetryLoadErrorHandlingPolicy(
|
|
|
107
107
|
*/
|
|
108
108
|
private fun exhaustedBudget(currentTime: Long): String? {
|
|
109
109
|
firstErrorTime?.let { start ->
|
|
110
|
-
if (currentTime - start >= maxRetryDurationMs)
|
|
110
|
+
if (currentTime - start >= maxRetryDurationMs)
|
|
111
|
+
return "max retry duration ($maxRetryDurationMs ms)"
|
|
111
112
|
}
|
|
112
113
|
if (!hasPlayed() && isOnline()) {
|
|
113
114
|
firstOnlineErrorTime?.let { start ->
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import androidx.media3.exoplayer.source.ShuffleOrder
|
|
4
|
+
import kotlin.random.Random
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* A shuffle order over [count] items with [startIndex] pinned to shuffle position 0.
|
|
8
|
+
*
|
|
9
|
+
* Media3 does not do this for us. `ExoPlayerImpl.setMediaSources` hands the start index to
|
|
10
|
+
* `ShuffleOrder.cloneAndSet(insertionCount, startIndex)`, but that is an interface default of
|
|
11
|
+
* `cloneAndClear().cloneAndInsert(0, insertionCount)` — the start index is discarded — and
|
|
12
|
+
* `DefaultShuffleOrder` does not override it (verified against the pinned media3 build). So with
|
|
13
|
+
* shuffle on, the track playback starts from lands at a random position in the order, and a 1-in-N
|
|
14
|
+
* share of queues put it last: `nextMediaItemIndex` is then `INDEX_UNSET` from the very first
|
|
15
|
+
* track, so auto-advance ends the queue after one track and fires `onQueueEnded`. The
|
|
16
|
+
* voice-assistant cold resume expands a queue exactly this way, so it sits squarely on that path.
|
|
17
|
+
*
|
|
18
|
+
* Applied unconditionally by `Player.setQueue`, like the Swift twin's `adoptInitialCurrent`:
|
|
19
|
+
* enabling shuffle later does not regenerate the order, so it has to be sane whether or not shuffle
|
|
20
|
+
* is on right now.
|
|
21
|
+
*/
|
|
22
|
+
internal fun shuffleOrderLedBy(startIndex: Int, count: Int, random: Random = Random): ShuffleOrder {
|
|
23
|
+
val first = startIndex.coerceIn(0, (count - 1).coerceAtLeast(0))
|
|
24
|
+
val indices = IntArray(count)
|
|
25
|
+
if (count > 0) {
|
|
26
|
+
indices[0] = first
|
|
27
|
+
((0 until count) - first).shuffled().forEachIndexed { i, index -> indices[i + 1] = index }
|
|
28
|
+
}
|
|
29
|
+
return ShuffleOrder.DefaultShuffleOrder(indices, random.nextLong())
|
|
30
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
package com.audiobrowser.tls
|
|
2
2
|
|
|
3
3
|
import java.security.cert.X509Certificate
|
|
4
|
+
import javax.security.auth.x500.X500Principal
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Fills in missing intermediate CA certificates by following the Authority Information Access (AIA)
|
|
@@ -14,6 +15,18 @@ import java.security.cert.X509Certificate
|
|
|
14
15
|
* found".
|
|
15
16
|
*/
|
|
16
17
|
object AiaCertChaser {
|
|
18
|
+
/** How many distinct CA-Issuers URLs from one certificate are worth trying. */
|
|
19
|
+
const val MAX_URLS_PER_CERT = 3
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Wall-clock ceiling on one chain-completion attempt, across all of its fetches. The deadline it
|
|
23
|
+
* implies is handed to every fetch, whose connects, handshakes, reads and redirects are all
|
|
24
|
+
* clipped to the time remaining — so the whole walk ends at the deadline. The one thing it cannot
|
|
25
|
+
* cut short is a DNS lookup already in flight (Java exposes no timeout for resolution), so the
|
|
26
|
+
* true bound is this budget plus at most one lookup's duration.
|
|
27
|
+
*/
|
|
28
|
+
const val MAX_CHASE_MILLIS = 20_000L
|
|
29
|
+
|
|
17
30
|
/** Authority Information Access extension. */
|
|
18
31
|
private const val AIA_OID = "1.3.6.1.5.5.7.1.1"
|
|
19
32
|
|
|
@@ -69,8 +82,9 @@ object AiaCertChaser {
|
|
|
69
82
|
|
|
70
83
|
/**
|
|
71
84
|
* Walks up from the presented chain, fetching each missing issuer via its predecessor's AIA "CA
|
|
72
|
-
* Issuers" pointer, until it reaches a
|
|
73
|
-
* or [maxIntermediates] additions.
|
|
85
|
+
* Issuers" pointer, until it reaches a certificate issued by one of [anchorSubjects], a
|
|
86
|
+
* self-signed certificate, an issuer that cannot be fetched, or [maxIntermediates] additions.
|
|
87
|
+
* Returns the (possibly extended) chain.
|
|
74
88
|
*
|
|
75
89
|
* Only ever *adds* certificates — the caller is still responsible for validating the completed
|
|
76
90
|
* chain against the system trust anchors, so this can never cause an untrusted chain to be
|
|
@@ -78,25 +92,52 @@ object AiaCertChaser {
|
|
|
78
92
|
* selected (defends against an AIA pointer to an unrelated certificate, and picks the right one
|
|
79
93
|
* out of a multi-certificate PKCS#7 bundle).
|
|
80
94
|
*
|
|
95
|
+
* @param anchorSubjects the subjects of the caller's trust anchors. A chain whose top is already
|
|
96
|
+
* issued by one of them is not missing anything, so nothing is fetched — chasing could not help
|
|
97
|
+
* and the fetch would be a blocking round trip to a host named by a certificate that just
|
|
98
|
+
* failed validation. This is what keeps an expired-but-complete chain, a hostname mismatch or
|
|
99
|
+
* any other non-path failure from triggering a chase, and it stops the genuine
|
|
100
|
+
* missing-intermediate case one hop early, where the chain reaches a root the caller already
|
|
101
|
+
* trusts. Empty means "unknown", and the walk runs to one of the other stopping conditions.
|
|
102
|
+
* @param maxUrlsPerCert how many of a certificate's distinct CA-Issuers URLs are tried before
|
|
103
|
+
* giving up on it. The extension is authored by the same server that failed validation and
|
|
104
|
+
* nothing limits how many URLs it may list — a leaf can carry hundreds — while each one costs a
|
|
105
|
+
* blocking connect on the handshake thread. Real CAs publish one. Duplicates are collapsed
|
|
106
|
+
* before the cap, so the cap buys distinct hosts, not repeat visits to one dead one.
|
|
107
|
+
* @param budgetMs wall-clock ceiling on the whole walk. It is checked before each fetch, and the
|
|
108
|
+
* deadline it implies is passed to [fetch], which is expected to clip its own connects,
|
|
109
|
+
* handshakes, reads and redirects to the time remaining — so the budget bounds the fetches
|
|
110
|
+
* themselves, not just how many of them start.
|
|
81
111
|
* @param fetch resolves a CA-Issuers URL to its candidate certificates (e.g. every certificate in
|
|
82
|
-
* a PKCS#7 bundle)
|
|
112
|
+
* a PKCS#7 bundle), giving up no later than `deadlineNanos` (absolute, [nowNanos] origin);
|
|
113
|
+
* empty if nothing could be retrieved.
|
|
83
114
|
*/
|
|
84
115
|
fun completeChain(
|
|
85
116
|
presented: List<X509Certificate>,
|
|
117
|
+
anchorSubjects: Set<X500Principal> = emptySet(),
|
|
86
118
|
maxIntermediates: Int = 5,
|
|
87
|
-
|
|
119
|
+
maxUrlsPerCert: Int = MAX_URLS_PER_CERT,
|
|
120
|
+
budgetMs: Long = MAX_CHASE_MILLIS,
|
|
121
|
+
nowNanos: () -> Long = System::nanoTime,
|
|
122
|
+
fetch: (url: String, deadlineNanos: Long) -> List<X509Certificate>,
|
|
88
123
|
): List<X509Certificate> {
|
|
89
124
|
if (presented.isEmpty()) return presented
|
|
90
125
|
val chain = presented.toMutableList()
|
|
91
126
|
val seen = HashSet(chain)
|
|
127
|
+
val deadline = nowNanos() + budgetMs * 1_000_000
|
|
92
128
|
var added = 0
|
|
93
129
|
while (added < maxIntermediates) {
|
|
94
130
|
val last = chain.last()
|
|
95
131
|
if (last.subjectX500Principal == last.issuerX500Principal) break // self-signed root
|
|
132
|
+
if (last.issuerX500Principal in anchorSubjects) break // already reaches a trust anchor
|
|
96
133
|
val issuer =
|
|
97
134
|
extractCaIssuerUrls(last)
|
|
98
135
|
.asSequence()
|
|
99
|
-
.
|
|
136
|
+
.distinct()
|
|
137
|
+
.take(maxUrlsPerCert)
|
|
138
|
+
// Subtraction, not `>`: overflow-safe across nanoTime's arbitrary origin.
|
|
139
|
+
.takeWhile { nowNanos() - deadline < 0 }
|
|
140
|
+
.flatMap { url -> runCatching { fetch(url, deadline) }.getOrElse { emptyList() } }
|
|
100
141
|
.firstOrNull { it.subjectX500Principal == last.issuerX500Principal } ?: break
|
|
101
142
|
if (!seen.add(issuer)) break // cycle guard
|
|
102
143
|
chain.add(issuer)
|
|
@@ -106,9 +147,13 @@ object AiaCertChaser {
|
|
|
106
147
|
}
|
|
107
148
|
|
|
108
149
|
/**
|
|
109
|
-
* Minimal DER TLV reader over a byte buffer.
|
|
110
|
-
*
|
|
111
|
-
*
|
|
150
|
+
* Minimal DER TLV reader over a byte buffer. Malformed input throws [IllegalArgumentException],
|
|
151
|
+
* which the callers above expect and turn into "no AIA".
|
|
152
|
+
*
|
|
153
|
+
* Every read is bounds-checked, and a declared length is rejected unless it is non-negative and
|
|
154
|
+
* within the buffer. Both matter: the extension bytes come from a server-presented certificate,
|
|
155
|
+
* so a length that shifts into a negative Int would rewind `pos` and spin [extractCaIssuerUrls]'s
|
|
156
|
+
* loop forever on the handshake thread rather than failing.
|
|
112
157
|
*/
|
|
113
158
|
private class DerReader(private val buf: ByteArray) {
|
|
114
159
|
private var pos = 0
|
|
@@ -116,17 +161,28 @@ object AiaCertChaser {
|
|
|
116
161
|
fun hasNext(): Boolean = pos < buf.size
|
|
117
162
|
|
|
118
163
|
fun read(): Tlv {
|
|
119
|
-
val tag =
|
|
120
|
-
var len =
|
|
164
|
+
val tag = readByte()
|
|
165
|
+
var len = readByte()
|
|
121
166
|
if (len and 0x80 != 0) {
|
|
167
|
+
// Long form: the low bits give the number of length bytes. Four already covers any
|
|
168
|
+
// buffer that fits in memory; more would overflow the Int we shift them into. The
|
|
169
|
+
// indefinite form (0x80, i.e. zero length bytes) is not valid DER.
|
|
122
170
|
val numBytes = len and 0x7F
|
|
171
|
+
require(numBytes in 1..4) { "unsupported DER length form: $numBytes length bytes" }
|
|
123
172
|
len = 0
|
|
124
|
-
repeat(numBytes) { len = (len shl 8) or (
|
|
173
|
+
repeat(numBytes) { len = (len shl 8) or readByte() }
|
|
174
|
+
require(len >= 0) { "DER length overflows Int" }
|
|
125
175
|
}
|
|
176
|
+
require(len <= buf.size - pos) { "DER length $len runs past the end of the buffer" }
|
|
126
177
|
val tlv = Tlv(buf, tag, pos, len)
|
|
127
178
|
pos += len
|
|
128
179
|
return tlv
|
|
129
180
|
}
|
|
181
|
+
|
|
182
|
+
private fun readByte(): Int {
|
|
183
|
+
require(pos < buf.size) { "truncated DER" }
|
|
184
|
+
return buf[pos++].toInt() and 0xFF
|
|
185
|
+
}
|
|
130
186
|
}
|
|
131
187
|
|
|
132
188
|
/** A parsed tag-length-value: the tag and a view of its content bytes. */
|