react-native-audio-browser 0.2.0-next.5 → 0.2.0-next.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -23
- package/android/build.gradle +43 -15
- package/android/gradle.properties +3 -3
- package/android/src/main/AndroidManifest.xml +3 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +550 -283
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +38 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +18 -2
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +131 -0
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +128 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +41 -11
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +23 -10
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +315 -213
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +31 -23
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +288 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +97 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +70 -29
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +20 -3
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +4 -5
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +24 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +10 -6
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +7 -0
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +77 -0
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +63 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +34 -12
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +639 -278
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +85 -33
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +88 -44
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +26 -14
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +113 -78
- package/android/src/main/java/com/audiobrowser/player/Player.kt +180 -84
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +16 -4
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +67 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +168 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +35 -7
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +278 -59
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +39 -0
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +15 -0
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +61 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -1
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +24 -49
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +22 -1
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +2 -2
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +103 -67
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +152 -0
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +103 -0
- package/android/src/test/java/com/audiobrowser/RemoteOutputsTest.kt +22 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +159 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -34
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +346 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +70 -5
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +301 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -55
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +160 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +477 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
- package/android/src/test/java/com/audiobrowser/player/FavoriteCapabilityTest.kt +109 -0
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +138 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +212 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +3 -4
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +48 -16
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +67 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +92 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +192 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +151 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +197 -7
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +325 -4
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +83 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +55 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +162 -0
- package/android/src/test/java/com/audiobrowser/util/NetworkConnectivityMonitorTest.kt +99 -0
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +95 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +91 -1
- package/ios/AVPlayerEngine.swift +362 -0
- package/ios/AVPlayerEngineCallbacks.swift +14 -0
- package/ios/Browser/BrowseGate.swift +58 -0
- package/ios/Browser/BrowserConfig.swift +115 -81
- package/ios/Browser/BrowserError.swift +16 -0
- package/ios/Browser/BrowserManager.swift +155 -654
- package/ios/Browser/BrowserPathHelper.swift +68 -51
- package/ios/Browser/FavoriteSet.swift +46 -0
- package/ios/Browser/InertStyleDiagnostic.swift +296 -0
- package/ios/Browser/JsonModels.swift +270 -321
- package/ios/Browser/NavigationErrorState.swift +41 -0
- package/ios/Browser/PageResolver.swift +147 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +303 -0
- package/ios/Browser/SearchDrillIn.swift +7 -7
- package/ios/Browser/SectionScope.swift +82 -23
- package/ios/Browser/SimpleRouter.swift +73 -144
- package/ios/Browser/StyleResolver.swift +58 -0
- package/ios/Browser/TabBarEntries.swift +9 -3
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +93 -43
- package/ios/CarPlay/CarPlayArtworkResolver.swift +36 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +91 -163
- package/ios/CarPlay/CarPlayListItemFactory.swift +288 -102
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +137 -177
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +91 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +192 -0
- package/ios/CarPlay/CarPlaySession.swift +207 -0
- package/ios/CarPlay/CarPlayTemplates.swift +63 -0
- package/ios/CarPlay/IntentHandlers.swift +96 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +105 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +21 -25
- package/ios/CarPlay/MediaIntentPlayback.swift +74 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +35 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +77 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +96 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/NavigationError+Conversion.swift +14 -4
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +13 -15
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +29 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -4
- package/ios/Extension/Track+AVPlayer.swift +0 -16
- package/ios/Extension/Track+Copying.swift +11 -13
- package/ios/Extension/Track+Identity.swift +25 -0
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Http/HttpClient.swift +71 -165
- package/ios/HybridAudioBrowser+Browser.swift +136 -0
- package/ios/HybridAudioBrowser+Options.swift +105 -0
- package/ios/HybridAudioBrowser+Player.swift +341 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +157 -0
- package/ios/HybridAudioBrowser+Stubs.swift +46 -0
- package/ios/HybridAudioBrowser.swift +131 -1652
- package/ios/Model/NitroTypeStubs.swift +239 -24
- package/ios/Model/PlayerUpdateOptions.swift +10 -1
- package/ios/Model/RemoteCommand.swift +6 -60
- package/ios/Model/TrackPlayerError.swift +6 -2
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +18 -53
- package/ios/Observer/ItemObserver.swift +90 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +42 -92
- package/ios/Player/AudioSessionController.swift +191 -0
- package/ios/Player/DeferredSeek.swift +70 -0
- package/ios/Player/ErrorStatus.swift +50 -0
- package/ios/Player/MediaLoader.swift +66 -87
- package/ios/Player/NowPlayingLines.swift +52 -0
- package/ios/Player/NowPlayingUpdater.swift +182 -85
- package/ios/Player/PlaybackFailure.swift +125 -0
- package/ios/Player/PlaybackPersistence.swift +73 -0
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/Player.swift +975 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +104 -0
- package/ios/Player/PlayerStatusTypes.swift +2 -6
- package/ios/Player/QueueManager.swift +93 -67
- package/ios/Player/RetryLoop.swift +291 -0
- package/ios/Player/ShuffleOrder.swift +33 -0
- package/ios/Player/SleepTimerManager.swift +14 -16
- package/ios/Player/VolumeFader.swift +5 -0
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +43 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +100 -333
- package/ios/Tests/ArtworkFreshnessTests.swift +67 -0
- package/ios/Tests/BrowserPathHelperTests.swift +89 -15
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/DeferredSeekTests.swift +70 -0
- package/ios/Tests/EmitterTests.swift +22 -38
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +60 -0
- package/ios/Tests/GenerationMemoTests.swift +121 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +209 -0
- package/ios/Tests/JsonModelsTests.swift +194 -1
- package/ios/Tests/LRUCacheTests.swift +110 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +57 -46
- package/ios/Tests/MediaLoaderTests.swift +36 -67
- package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
- package/ios/Tests/NowPlayingLinesTests.swift +66 -0
- package/ios/Tests/ObserverTests.swift +88 -0
- package/ios/Tests/PlaybackErrorTests.swift +76 -0
- package/ios/Tests/PlaybackFailureTests.swift +189 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +93 -0
- package/ios/Tests/PlayerInvalidTrackTests.swift +65 -0
- package/ios/Tests/PlayerPolicyTests.swift +460 -0
- package/ios/Tests/{PlaybackCoordinatorTests.swift → PlayerTests.swift} +573 -395
- package/ios/Tests/PlayingStateTests.swift +42 -0
- package/ios/Tests/QueueManagerTests.swift +196 -115
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +181 -0
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -35
- package/ios/Tests/RetryLoopTests.swift +305 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +98 -0
- package/ios/Tests/SectionScopeTests.swift +139 -54
- package/ios/Tests/SimpleRouterTests.swift +38 -3
- package/ios/Tests/SleepTimerManagerTests.swift +65 -41
- package/ios/Tests/StyleResolverTests.swift +132 -0
- package/ios/Tests/Support/TestTypes.swift +146 -101
- package/ios/Tests/TabBarEntriesTests.swift +19 -19
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +42 -0
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +62 -65
- package/ios/Util/ArtworkFreshness.swift +42 -0
- package/ios/Util/ArtworkImageFetcher.swift +143 -5
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Emitter.swift +40 -12
- package/ios/Util/GenerationMemo.swift +36 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +32 -32
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +56 -0
- package/ios/Util/SFSymbolRenderer.swift +59 -31
- package/ios/Util/SVGProcessor.swift +9 -12
- package/lib/commonjs/AudioBrowser.js +8 -8
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +52 -0
- package/lib/commonjs/features/browser-config.js +12 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +11 -3
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +1 -1
- package/lib/commonjs/features/equalizer.js +1 -1
- package/lib/commonjs/features/errors.js +3 -3
- package/lib/commonjs/features/favorites.js +14 -11
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +16 -1
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +20 -3
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +1 -1
- package/lib/commonjs/features/nowPlaying.js +1 -1
- package/lib/commonjs/features/output.js +4 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +1 -1
- package/lib/commonjs/features/playback/playing.js +1 -1
- package/lib/commonjs/features/playback/progress.js +3 -2
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -4
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +0 -6
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +1 -1
- package/lib/commonjs/features/player/options.js +3 -19
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +5 -3
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +23 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -0
- package/lib/commonjs/features/queue/activeTrack.js +15 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +13 -6
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +1 -1
- package/lib/commonjs/features/queue/shuffle.js +1 -1
- package/lib/commonjs/features/remoteControls.js +13 -92
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +13 -1
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
- package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
- package/lib/commonjs/utils/LazyNativeEmitter.js +28 -14
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +202 -77
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/Player.js +254 -39
- package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +33 -12
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +175 -100
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +18 -23
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
- package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +62 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -1
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +52 -0
- package/lib/module/features/browser-config.js +12 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +11 -3
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +1 -1
- package/lib/module/features/equalizer.js +1 -1
- package/lib/module/features/errors.js +3 -3
- package/lib/module/features/favorites.js +14 -11
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +16 -1
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +20 -3
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +1 -1
- package/lib/module/features/nowPlaying.js +1 -1
- package/lib/module/features/output.js +4 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +1 -1
- package/lib/module/features/playback/playing.js +1 -1
- package/lib/module/features/playback/progress.js +3 -2
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -4
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +0 -5
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +1 -1
- package/lib/module/features/player/options.js +2 -17
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +4 -2
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +19 -0
- package/lib/module/features/player/validateOptions.js.map +1 -0
- package/lib/module/features/queue/activeTrack.js +15 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +13 -6
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +1 -1
- package/lib/module/features/queue/shuffle.js +1 -1
- package/lib/module/features/remoteControls.js +13 -92
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +13 -1
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/test-utils/reactNativeStub.js +58 -0
- package/lib/module/test-utils/reactNativeStub.js.map +1 -0
- package/lib/module/utils/LazyNativeEmitter.js +28 -14
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +202 -77
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
- package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/module/web/TrackPlayer/Player.js +254 -39
- package/lib/module/web/TrackPlayer/Player.js.map +1 -1
- package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueuePlayer.js +33 -12
- package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +175 -100
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/NavigationErrorManager.js +3 -1
- package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +18 -23
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/http/RequestConfigBuilder.js +110 -27
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/http/followMediaRedirect.js +215 -0
- package/lib/module/web/http/followMediaRedirect.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +62 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/package.json +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts +1 -1
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +10 -2
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +1 -1
- package/lib/typescript/src/features/errors.d.ts +3 -3
- package/lib/typescript/src/features/favorites.d.ts +14 -11
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +18 -2
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +20 -3
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
- package/lib/typescript/src/features/output.d.ts +4 -3
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +3 -4
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +1 -1
- package/lib/typescript/src/features/player/options.d.ts +24 -21
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +16 -1
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
- package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +7 -4
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +23 -22
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +3 -4
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
- package/lib/typescript/src/types/browser-native.d.ts +3 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +387 -126
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +93 -61
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +19 -16
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
- package/lib/typescript/src/utils/resolveAssetSource.d.ts.map +1 -1
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
- package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
- package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
- package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +4 -7
- package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
- package/nitrogen/generated/android/c++/JGate.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
- package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +68 -44
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +3 -3
- package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
- package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +19 -12
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
- package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
- package/nitrogen/generated/android/c++/JOptions.hpp +4 -7
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +5 -2
- package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
- package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +10 -10
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
- package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JSection.hpp +116 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
- package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
- package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
- package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
- package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +18 -12
- package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
- package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +3 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +39 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputType.kt +2 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
- package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +767 -638
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +28 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +30 -12
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
- package/nitrogen/generated/ios/swift/NativeSetupPlayerOptions.swift +19 -1
- package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/OutputType.swift +4 -0
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
- package/nitrogen/generated/ios/swift/Section.swift +82 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
- package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +28 -63
- package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
- package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
- package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
- package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
- package/nitrogen/generated/shared/c++/NativeSetupPlayerOptions.hpp +6 -2
- package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/OutputType.hpp +5 -1
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
- package/nitrogen/generated/shared/c++/Section.hpp +102 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +18 -30
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
- package/package.json +24 -11
- package/src/AudioBrowser.ts +2 -1
- package/src/CLAUDE.md +52 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +12 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +11 -3
- package/src/features/carConnection.ts +1 -1
- package/src/features/equalizer.ts +1 -1
- package/src/features/errors.ts +3 -3
- package/src/features/favorites.ts +14 -11
- package/src/features/gate.ts +16 -1
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +20 -3
- package/src/features/network.ts +1 -1
- package/src/features/nowPlaying.ts +1 -1
- package/src/features/output.ts +4 -3
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/playWhenReady.ts +1 -1
- package/src/features/playback/playing.ts +1 -1
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +3 -2
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +3 -4
- package/src/features/playback/trackPlaybackTime.test.ts +16 -6
- package/src/features/playback/trackPlaybackTime.ts +1 -6
- package/src/features/playback/volume.ts +1 -1
- package/src/features/player/options.ts +31 -40
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +27 -5
- package/src/features/player/validateOptions.ts +21 -0
- package/src/features/queue/activeTrack.ts +15 -4
- package/src/features/queue/queue.ts +13 -6
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +1 -1
- package/src/features/remoteControls.ts +13 -92
- package/src/features/sleepTimer.test.ts +172 -0
- package/src/features/sleepTimer.ts +9 -1
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +147 -0
- package/src/specs/audio-browser.nitro.ts +9 -8
- package/src/style-resolution.test.ts +210 -0
- package/src/test-utils/reactNativeStub.ts +60 -0
- package/src/types/browser-native.ts +7 -3
- package/src/types/browser-nodes.ts +403 -134
- package/src/types/browser.ts +97 -63
- package/src/utils/LazyNativeEmitter.ts +28 -15
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useNativeUpdatedValue.test.ts +103 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +241 -84
- package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
- package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
- package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
- package/src/web/TrackPlayer/Player.dispatch.test.ts +5 -3
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +284 -37
- package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
- package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/src/web/TrackPlayer/QueuePlayer.ts +33 -14
- package/src/web/__tests__/lifecycle.test.ts +345 -0
- package/src/web/__tests__/lifecycleHarness.ts +351 -0
- package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
- package/src/web/__tests__/loadSupersession.test.ts +175 -0
- package/src/web/__tests__/retry.test.ts +169 -0
- package/src/web/browser/BrowserManager.ts +209 -111
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/NavigationErrorManager.ts +3 -1
- package/src/web/browser/SearchManager.test.ts +75 -0
- package/src/web/browser/SearchManager.ts +25 -28
- package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
- package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
- package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/http/RequestConfigBuilder.test.ts +241 -1
- package/src/web/http/RequestConfigBuilder.ts +140 -33
- package/src/web/http/followMediaRedirect.test.ts +289 -0
- package/src/web/http/followMediaRedirect.ts +253 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +68 -0
- package/src/web/util/BrowserPathHelper.ts +70 -13
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +158 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +587 -0
- package/website/guide/carplay.md +650 -0
- package/website/guide/configuration.md +173 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +247 -0
- package/ios/Bridge.h +0 -8
- package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
- package/ios/Browser/MediaResolveComposer.swift +0 -114
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
- package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
- package/ios/Model/MediaURL.swift +0 -67
- package/ios/Model/SourceType.swift +0 -6
- package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
- package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
- package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
- package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
- package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
- package/ios/Observer/PlayerStateObserver.swift +0 -50
- package/ios/Observer/PlayerTimeObserver.swift +0 -55
- package/ios/Option/PitchAlgorithms.swift +0 -17
- package/ios/Option/TimeEventFrequency.swift +0 -18
- package/ios/Player/LoadSeekCoordinator.swift +0 -99
- package/ios/Player/MediaIntentCriteria.swift +0 -139
- package/ios/Player/MediaLoaderDelegate.swift +0 -11
- package/ios/Player/PlaybackCoordinator.swift +0 -754
- package/ios/Player/PlaybackEffectHandler.swift +0 -54
- package/ios/Player/PlaybackErrorHandler.swift +0 -175
- package/ios/Player/PlaybackStateStore.swift +0 -27
- package/ios/Player/PlayingStateManager.swift +0 -33
- package/ios/Player/RetryManager.swift +0 -322
- package/ios/Player/SeekCompletionHandler.swift +0 -3
- package/ios/Player/SleepTimerHandling.swift +0 -15
- package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
- package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -325
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -86
- package/ios/Util/MetadataAdapter.swift +0 -131
- package/ios/Util/OnceValue.swift +0 -104
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -1,43 +1,84 @@
|
|
|
1
1
|
package com.audiobrowser.browser
|
|
2
2
|
|
|
3
|
-
import com.
|
|
3
|
+
import com.audiobrowser.extension.identity
|
|
4
|
+
import com.margelo.nitro.audiobrowser.ResolvedTrack
|
|
5
|
+
import com.margelo.nitro.audiobrowser.Section
|
|
4
6
|
import com.margelo.nitro.audiobrowser.Track
|
|
5
7
|
|
|
6
8
|
/**
|
|
7
|
-
* Queue scope is the tapped section, not the whole page (ADR 0006): the
|
|
8
|
-
*
|
|
9
|
-
*
|
|
9
|
+
* Queue scope is the tapped section, not the whole page (ADR 0006): the playback context a listener
|
|
10
|
+
* expects is the list they tapped in — a page aggregating several sections must not leak
|
|
11
|
+
* next/previous across them. Sections are structural (ADR 0010), so scoping is a lookup, not a
|
|
12
|
+
* groupTitle-run derivation.
|
|
10
13
|
*/
|
|
11
14
|
object SectionScope {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
* The contiguous `groupTitle` run around the tapped child (items with no
|
|
18
|
-
* group title form runs of their own).
|
|
19
|
-
*/
|
|
20
|
-
data class Run(val tracks: List<Track>) : Section()
|
|
21
|
-
}
|
|
15
|
+
/**
|
|
16
|
+
* The section containing the tapped identity, plus the tapped child's offset within it — non-null
|
|
17
|
+
* only when the stamped flat index pinned the exact copy.
|
|
18
|
+
*/
|
|
19
|
+
data class Scoped(val section: Section, val tappedOffset: Int?)
|
|
22
20
|
|
|
23
21
|
/**
|
|
24
|
-
* The section of [
|
|
25
|
-
*
|
|
22
|
+
* The section of [sections] containing the playable [trackId] (a track identity — id when
|
|
23
|
+
* non-blank, else src), or null when not found.
|
|
24
|
+
*
|
|
25
|
+
* [tappedIndex] — the flat page position stamped into the contextual URL (children concatenated
|
|
26
|
+
* in section order) — is a tie-breaker, never an identifier: when the child at that position
|
|
27
|
+
* still carries the tapped identity, it pins which section (and which copy) was tapped; when it
|
|
28
|
+
* doesn't (the list shifted), resolution falls back to the first section containing the identity.
|
|
29
|
+
* A stale index can therefore never select a different track — at worst a different copy of the
|
|
30
|
+
* same one.
|
|
26
31
|
*/
|
|
27
|
-
fun
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
+
fun scoped(sections: List<Section>, trackId: String, tappedIndex: Int? = null): Scoped? {
|
|
33
|
+
if (tappedIndex != null && tappedIndex >= 0) {
|
|
34
|
+
var start = 0
|
|
35
|
+
for (section in sections) {
|
|
36
|
+
val offset = tappedIndex - start
|
|
37
|
+
if (offset < section.children.size) {
|
|
38
|
+
if (section.children[offset].identity == trackId) {
|
|
39
|
+
return Scoped(section, offset)
|
|
40
|
+
}
|
|
41
|
+
break
|
|
42
|
+
}
|
|
43
|
+
start += section.children.size
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
for (section in sections) {
|
|
47
|
+
if (section.children.any { it.identity == trackId }) {
|
|
48
|
+
return Scoped(section, null)
|
|
32
49
|
}
|
|
33
50
|
}
|
|
34
|
-
|
|
35
|
-
if (index < 0) return null
|
|
36
|
-
val group = children[index].groupTitle
|
|
37
|
-
var start = index
|
|
38
|
-
while (start > 0 && children[start - 1].groupTitle == group) start--
|
|
39
|
-
var end = index
|
|
40
|
-
while (end + 1 < children.size && children[end + 1].groupTitle == group) end++
|
|
41
|
-
return Section.Run(children.subList(start, end + 1).toList())
|
|
51
|
+
return null
|
|
42
52
|
}
|
|
43
53
|
}
|
|
54
|
+
|
|
55
|
+
// Page shape helpers (ADR 0010)
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* One untitled section — the canonical wrap of a flat track list (`children` authoring sugar,
|
|
59
|
+
* search results — ADR 0010).
|
|
60
|
+
*/
|
|
61
|
+
fun untitledSection(children: Array<Track>): Section =
|
|
62
|
+
Section(title = null, style = null, path = null, children = children)
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* The canonical sectioned shape: `sections` wins when present; plain `children` is authoring sugar
|
|
66
|
+
* for one untitled section.
|
|
67
|
+
*/
|
|
68
|
+
val ResolvedTrack.normalizedSections: List<Section>?
|
|
69
|
+
get() = sections?.toList() ?: children?.let { listOf(untitledSection(it)) }
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* [normalizedSections] with the page block folded in: each section's style resolves `section ??
|
|
73
|
+
* page` per property ([StyleResolver], ADR 0011), so everything downstream sees only effective
|
|
74
|
+
* section blocks — a page is a Track that is also the container of its sections.
|
|
75
|
+
*/
|
|
76
|
+
fun ResolvedTrack.styleResolvedSections(): List<Section>? =
|
|
77
|
+
normalizedSections?.map { it.copy(style = StyleResolver.sectionStyle(it.style, style)) }
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* The page's children concatenated in section order — the flattening that defines contextual
|
|
81
|
+
* `__index` positions and the flat views (tabs, search) of a sectioned page.
|
|
82
|
+
*/
|
|
83
|
+
val ResolvedTrack.flattenedChildren: List<Track>?
|
|
84
|
+
get() = normalizedSections?.flatMap { it.children.asList() }
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
package com.audiobrowser.browser
|
|
2
|
+
|
|
3
|
+
import com.margelo.nitro.audiobrowser.SectionStyle
|
|
4
|
+
import com.margelo.nitro.audiobrowser.TrackStyle
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The one place style declarations resolve to effective values (ADR 0011).
|
|
8
|
+
*
|
|
9
|
+
* Two mechanisms, deliberately distinct:
|
|
10
|
+
* - **Inherited item properties** resolve `track ?? section ?? page`, per property — a track's own
|
|
11
|
+
* declaration wins over the blocks that contain it.
|
|
12
|
+
* - **Container properties and the positional `display`** resolve by scope override: `section ??
|
|
13
|
+
* page` — the page declares for its whole scope, a section overrides for its own children.
|
|
14
|
+
* `display` is never inherited item-to-container: each holder describes its own children, and a
|
|
15
|
+
* track's `display` is the promise for the page *it* opens, not its rendering inside this
|
|
16
|
+
* section.
|
|
17
|
+
*
|
|
18
|
+
* Every key of `SectionStyle` must be read by [sectionStyle] and every inherited key of
|
|
19
|
+
* `TrackStyle` by [trackStyle] — Nitro flattens the spec's `extends`, so
|
|
20
|
+
* `src/style-resolution.test.ts` enforces this completeness, not the type system.
|
|
21
|
+
*/
|
|
22
|
+
object StyleResolver {
|
|
23
|
+
/**
|
|
24
|
+
* Folds the page block into a section's block: every `SectionStyle` key resolves `section ??
|
|
25
|
+
* page`. The result is the section's effective block; item resolution then only needs `track ??
|
|
26
|
+
* section`.
|
|
27
|
+
*/
|
|
28
|
+
fun sectionStyle(section: SectionStyle?, page: SectionStyle?): SectionStyle =
|
|
29
|
+
SectionStyle(
|
|
30
|
+
display = section?.display ?: page?.display,
|
|
31
|
+
artworkRendering = section?.artworkRendering ?: page?.artworkRendering,
|
|
32
|
+
imageShape = section?.imageShape ?: page?.imageShape,
|
|
33
|
+
accessorySymbol = section?.accessorySymbol ?: page?.accessorySymbol,
|
|
34
|
+
cardTint = section?.cardTint ?: page?.cardTint,
|
|
35
|
+
cardImage = section?.cardImage ?: page?.cardImage,
|
|
36
|
+
gridWrap = section?.gridWrap ?: page?.gridWrap,
|
|
37
|
+
gridTile = section?.gridTile ?: page?.gridTile,
|
|
38
|
+
)
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Resolves a track's effective item properties against its (page-folded) section block.
|
|
42
|
+
*
|
|
43
|
+
* No Android renderer consumes the result yet — today's only inherited property
|
|
44
|
+
* (`artworkRendering`) is CarPlay-rendered — but the resolver ships on both platforms so the
|
|
45
|
+
* completeness test can hold every future inherited key to the same rule from day one.
|
|
46
|
+
*/
|
|
47
|
+
fun trackStyle(track: TrackStyle?, section: SectionStyle?): TrackStyle =
|
|
48
|
+
TrackStyle(
|
|
49
|
+
// Positional deny-list: `display` is never inherited onto an item — resolved null, so no
|
|
50
|
+
// renderer can mistake the handle's page promise for this item's own layout.
|
|
51
|
+
display = null,
|
|
52
|
+
artworkRendering = track?.artworkRendering ?: section?.artworkRendering,
|
|
53
|
+
imageShape = track?.imageShape ?: section?.imageShape,
|
|
54
|
+
// 'none' resolves like any value — a renderer treats it as "no accessory, derived
|
|
55
|
+
// behavior" (the inheritance escape). No Android surface draws these properties today.
|
|
56
|
+
accessorySymbol = track?.accessorySymbol ?: section?.accessorySymbol,
|
|
57
|
+
cardTint = track?.cardTint ?: section?.cardTint,
|
|
58
|
+
cardImage = track?.cardImage ?: section?.cardImage,
|
|
59
|
+
)
|
|
60
|
+
}
|
|
@@ -2,6 +2,7 @@ package com.audiobrowser.extension
|
|
|
2
2
|
|
|
3
3
|
import com.margelo.nitro.audiobrowser.ResolvedTrack
|
|
4
4
|
import com.margelo.nitro.audiobrowser.Track
|
|
5
|
+
import com.margelo.nitro.audiobrowser.TrackStyle
|
|
5
6
|
|
|
6
7
|
/**
|
|
7
8
|
* The Track view of a ResolvedTrack: every display/playback field carried over, the browse-only
|
|
@@ -12,24 +13,36 @@ import com.margelo.nitro.audiobrowser.Track
|
|
|
12
13
|
fun ResolvedTrack.toTrack(): Track =
|
|
13
14
|
Track(
|
|
14
15
|
id = id,
|
|
15
|
-
|
|
16
|
+
path = path,
|
|
16
17
|
src = src,
|
|
17
18
|
artwork = artwork,
|
|
18
19
|
artworkSource = artworkSource,
|
|
19
20
|
request = request,
|
|
20
|
-
artworkCarPlayTinted = artworkCarPlayTinted,
|
|
21
21
|
title = title,
|
|
22
22
|
subtitle = subtitle,
|
|
23
23
|
artist = artist,
|
|
24
|
-
|
|
24
|
+
albumPath = albumPath,
|
|
25
25
|
album = album,
|
|
26
26
|
description = description,
|
|
27
27
|
genre = genre,
|
|
28
28
|
duration = duration,
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
// An explicit SectionStyle → TrackStyle projection: the page's container
|
|
30
|
+
// properties (gridWrap) have no meaning on a plain Track, so they drop —
|
|
31
|
+
// Nitro flattens the spec's `extends`, making this narrowing a hand-written
|
|
32
|
+
// field list rather than an upcast (ADR 0011).
|
|
33
|
+
style =
|
|
34
|
+
style?.let {
|
|
35
|
+
TrackStyle(
|
|
36
|
+
display = it.display,
|
|
37
|
+
artworkRendering = it.artworkRendering,
|
|
38
|
+
imageShape = it.imageShape,
|
|
39
|
+
accessorySymbol = it.accessorySymbol,
|
|
40
|
+
cardTint = it.cardTint,
|
|
41
|
+
cardImage = it.cardImage,
|
|
42
|
+
)
|
|
43
|
+
},
|
|
44
|
+
disabled = disabled,
|
|
31
45
|
favorited = favorited,
|
|
32
|
-
groupTitle = groupTitle,
|
|
33
46
|
live = live,
|
|
34
|
-
|
|
47
|
+
icyCharset = icyCharset,
|
|
35
48
|
)
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
package com.audiobrowser.extension
|
|
2
|
+
|
|
3
|
+
import com.audiobrowser.util.BrowserPathHelper
|
|
4
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The queue position of the tapped surface, for skip-in-place. Exact-surface match first: a
|
|
8
|
+
* contextual path carries the tapped page position (`__index`), so path equality pins the exact
|
|
9
|
+
* copy when the page holds the same identity more than once. The identity match remains for
|
|
10
|
+
* index-less paths (e.g. pre-stamp persisted state); an index-stamped path with no exact match
|
|
11
|
+
* returns -1, and the caller falls through to expansion, which re-scopes the queue to the tapped
|
|
12
|
+
* section (ADR 0009).
|
|
13
|
+
*/
|
|
14
|
+
fun Array<Track>.indexOfTappedTrack(contextualPath: String, trackId: String?): Int {
|
|
15
|
+
val index = indexOfFirst { it.path == contextualPath }
|
|
16
|
+
if (index >= 0 || BrowserPathHelper.extractIndex(contextualPath) != null || trackId == null) {
|
|
17
|
+
return index
|
|
18
|
+
}
|
|
19
|
+
return indexOfFirst { it.identity == trackId }
|
|
20
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
package com.audiobrowser.extension
|
|
2
|
+
|
|
3
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* A track's identity: the opaque `id` when present (non-blank), else the playable `src`. Two tracks
|
|
7
|
+
* refer to the same item iff their identities are equal. Browsable-only tracks (neither `id` nor
|
|
8
|
+
* `src`) have no identity — they are addressed by `path` instead.
|
|
9
|
+
*
|
|
10
|
+
* This is THE comparison rule for favorites matching, section scoping, skip-in-place, the car
|
|
11
|
+
* now-playing row indicator, and the contextual `__trackId` — see ADR 0008. Mirrors the TS
|
|
12
|
+
* `trackIdentity` helper.
|
|
13
|
+
*/
|
|
14
|
+
val Track.identity: String?
|
|
15
|
+
get() = id?.takeUnless { it.isBlank() } ?: src
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
package com.audiobrowser.http
|
|
2
2
|
|
|
3
|
+
import com.audiobrowser.BuildConfig
|
|
3
4
|
import java.io.IOException
|
|
4
5
|
import java.util.concurrent.TimeUnit
|
|
5
6
|
import kotlinx.coroutines.Dispatchers
|
|
@@ -27,13 +28,29 @@ class HttpClient {
|
|
|
27
28
|
isLenient = true
|
|
28
29
|
}
|
|
29
30
|
|
|
30
|
-
|
|
31
|
+
/**
|
|
32
|
+
* Full request/response logging, for debug builds only.
|
|
33
|
+
*
|
|
34
|
+
* Timber is exposed as `api`, so whatever this logs reaches the host app's tree — a Crashlytics
|
|
35
|
+
* or Sentry breadcrumb tree included. That means credentials attached by the request-transform
|
|
36
|
+
* layer and every response body, so the interceptor is not installed in release at all: `BODY`
|
|
37
|
+
* also buffers and stringifies each response whether or not anything reads the log.
|
|
38
|
+
*
|
|
39
|
+
* The redactions apply in debug too. Logcat is shared in bug reports and screen shares.
|
|
40
|
+
*/
|
|
41
|
+
private fun loggingInterceptor() =
|
|
31
42
|
HttpLoggingInterceptor { message -> Timber.d(message) }
|
|
32
|
-
.apply {
|
|
43
|
+
.apply {
|
|
44
|
+
level = HttpLoggingInterceptor.Level.BODY
|
|
45
|
+
redactHeader("Authorization")
|
|
46
|
+
redactHeader("Proxy-Authorization")
|
|
47
|
+
redactHeader("Cookie")
|
|
48
|
+
redactHeader("Set-Cookie")
|
|
49
|
+
}
|
|
33
50
|
|
|
34
51
|
private val client =
|
|
35
52
|
OkHttpClient.Builder()
|
|
36
|
-
.addInterceptor(loggingInterceptor)
|
|
53
|
+
.apply { if (BuildConfig.DEBUG) addInterceptor(loggingInterceptor()) }
|
|
37
54
|
.connectTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
|
|
38
55
|
.readTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
|
|
39
56
|
.writeTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
|
|
@@ -153,12 +153,11 @@ object RequestConfigBuilder {
|
|
|
153
153
|
* per-track `request` override (e.g. a strict-UA sentinel the consumer swaps for a clean
|
|
154
154
|
* User-Agent) — and returns the config whose fields win.
|
|
155
155
|
*
|
|
156
|
-
* No-op when the media config has no `resolve` callback
|
|
157
|
-
*
|
|
158
|
-
*
|
|
156
|
+
* No-op when the media config has no `resolve` callback (so the request/media layers stand). The
|
|
157
|
+
* callback may return its config synchronously (variant `first`) or via a Promise (`second`).
|
|
158
|
+
* Mirrors iOS resolveMediaTrackConfig + applyMediaResolveLayer.
|
|
159
159
|
*/
|
|
160
|
-
suspend fun applyMediaResolve(layered: MediaRequestConfig, track: Track
|
|
161
|
-
if (track == null) return layered
|
|
160
|
+
suspend fun applyMediaResolve(layered: MediaRequestConfig, track: Track): MediaRequestConfig {
|
|
162
161
|
if (layered.resolve == null && layered.resolveSync == null) return layered
|
|
163
162
|
val resolved: RequestConfig =
|
|
164
163
|
try {
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
package com.audiobrowser.model
|
|
2
|
+
|
|
3
|
+
import java.nio.charset.Charset
|
|
4
|
+
|
|
5
|
+
/** Re-decodes an ICY `StreamTitle` with the charset the track declares. */
|
|
6
|
+
internal object IcyTitle {
|
|
7
|
+
/**
|
|
8
|
+
* [title] re-decoded through ISO-8859-1 with [charset] when it is Latin-1 shaped: every char at
|
|
9
|
+
* or below U+00FF, at least one at or above U+0080. That shape is what media3's ISO-8859-1
|
|
10
|
+
* fallback yields for bytes that are not UTF-8, and also what a station that UTF-8-encoded its
|
|
11
|
+
* legacy bytes yields; ISO-8859-1 is lossless, so both re-decode. Returns [title] as is when it
|
|
12
|
+
* has another shape, is pure ASCII, or [charset] is not one the runtime can decode with.
|
|
13
|
+
*/
|
|
14
|
+
fun redecode(title: String, charset: String): String {
|
|
15
|
+
var high = false
|
|
16
|
+
for (c in title) {
|
|
17
|
+
if (c.code > 0xFF) return title
|
|
18
|
+
if (c.code >= 0x80) high = true
|
|
19
|
+
}
|
|
20
|
+
if (!high) return title
|
|
21
|
+
val cs = runCatching { Charset.forName(charset) }.getOrNull() ?: return title
|
|
22
|
+
return String(title.toByteArray(Charsets.ISO_8859_1), cs)
|
|
23
|
+
}
|
|
24
|
+
}
|
|
@@ -15,11 +15,12 @@ data class PlaybackMetadata(
|
|
|
15
15
|
companion object {
|
|
16
16
|
/**
|
|
17
17
|
* Creates PlaybackMetadata from raw Metadata entries. Handles ICY streams specially, uses
|
|
18
|
-
* Media3's unified approach for everything else.
|
|
18
|
+
* Media3's unified approach for everything else. [icyCharset] is the track's declared charset
|
|
19
|
+
* for ICY titles media3 decoded as Latin-1; it never touches other metadata.
|
|
19
20
|
*/
|
|
20
|
-
fun from(metadata: Metadata): PlaybackMetadata? {
|
|
21
|
+
fun from(metadata: Metadata, icyCharset: String? = null): PlaybackMetadata? {
|
|
21
22
|
// Try ICY first (streaming-specific)
|
|
22
|
-
fromIcy(metadata)?.let {
|
|
23
|
+
fromIcy(metadata, icyCharset)?.let {
|
|
23
24
|
return it
|
|
24
25
|
}
|
|
25
26
|
|
|
@@ -32,12 +33,15 @@ data class PlaybackMetadata(
|
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
/** Shoutcast / Icecast metadata (ICY protocol) https://cast.readme.io/docs/icy */
|
|
35
|
-
private fun fromIcy(metadata: Metadata): PlaybackMetadata? {
|
|
36
|
+
private fun fromIcy(metadata: Metadata, icyCharset: String?): PlaybackMetadata? {
|
|
36
37
|
for (i in 0 until metadata.length()) {
|
|
37
38
|
when (val entry = metadata[i]) {
|
|
38
39
|
is IcyInfo -> {
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
val title = entry.title
|
|
41
|
+
if (title != null) {
|
|
42
|
+
return PlaybackMetadata(
|
|
43
|
+
title = icyCharset?.let { IcyTitle.redecode(title, it) } ?: title
|
|
44
|
+
)
|
|
41
45
|
}
|
|
42
46
|
}
|
|
43
47
|
}
|
|
@@ -70,6 +70,13 @@ data class PlayerSetupOptions(
|
|
|
70
70
|
val automaticBuffer: Boolean
|
|
71
71
|
get() = rebufferBuffer == null
|
|
72
72
|
|
|
73
|
+
/**
|
|
74
|
+
* A copy that equals another's when both build the same engine: without the now-playing options,
|
|
75
|
+
* which apply without a rebuild. A formatter is a new object on every setup call.
|
|
76
|
+
*/
|
|
77
|
+
fun engineOptions() =
|
|
78
|
+
copy(autoUpdateNowPlayingMetadata = true, nowPlayingMetadataFormatter = null)
|
|
79
|
+
|
|
73
80
|
fun update(options: NativeSetupPlayerOptions) {
|
|
74
81
|
// Android-specific options
|
|
75
82
|
options.android?.let { android ->
|
|
@@ -20,7 +20,7 @@ data class PlayerUpdateOptions(
|
|
|
20
20
|
var progressUpdateEventInterval: Double? = null,
|
|
21
21
|
|
|
22
22
|
// Player capabilities - most enabled by default, only false values disable
|
|
23
|
-
// Exceptions:
|
|
23
|
+
// Exceptions: jumpForward, jumpBackward default to false
|
|
24
24
|
var capabilities: PlayerCapabilities =
|
|
25
25
|
PlayerCapabilities(
|
|
26
26
|
play = null,
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import okhttp3.HttpUrl
|
|
4
|
+
import okhttp3.Interceptor
|
|
5
|
+
import okhttp3.Request
|
|
6
|
+
import okhttp3.Response
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Drops the caller's headers once a redirect leaves the origin.
|
|
10
|
+
*
|
|
11
|
+
* OkHttp does this for `Authorization` alone — RetryAndFollowUpInterceptor.buildRedirectRequest is
|
|
12
|
+
* a single `removeHeader("Authorization")` — so every other configured header, an `X-Api-Key` say,
|
|
13
|
+
* still reaches whatever host the first one named. iOS forwards none across a hop and web clears
|
|
14
|
+
* them too; this brings Android in line.
|
|
15
|
+
*
|
|
16
|
+
* Installed as a **network** interceptor, which runs once per hop. `chain.call().request()` is the
|
|
17
|
+
* call's original request, so the comparison is always against the URL the credential was addressed
|
|
18
|
+
* to rather than the hop before.
|
|
19
|
+
*
|
|
20
|
+
* Scoped to the redirect hop, and only that. An HLS segment or key fetch is its own Call, already
|
|
21
|
+
* addressed to the absolute CDN URL, and [TransformingDataSource] deliberately re-applies the
|
|
22
|
+
* config's headers to it — authenticated segments are a supported shape, and web does the same
|
|
23
|
+
* through Shaka's request filter. So this closes the leak of handing a credential to a host the
|
|
24
|
+
* caller never named; it is not a rule that the credential stays on one origin.
|
|
25
|
+
*/
|
|
26
|
+
internal object CrossOriginHeaderStripper : Interceptor {
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Headers that describe the transport rather than the caller. OkHttp and media3 set these per hop
|
|
30
|
+
* — `Range` carries the seek, `Host` and `Connection` are the connection's own — so the request
|
|
31
|
+
* breaks without them. Everything else on a media request came from the media config, and is the
|
|
32
|
+
* caller's to send only to the host it addressed.
|
|
33
|
+
*
|
|
34
|
+
* `Icy-MetaData` is media3's, not the caller's: `ProgressiveMediaPeriod` asks for Shoutcast
|
|
35
|
+
* metadata through `ICY_METADATA_HEADERS` on the DataSpec — the same channel
|
|
36
|
+
* [TransformingDataSource] puts the config's headers on, so nothing downstream can tell them
|
|
37
|
+
* apart. Dropping it on a hop costs the station's `icy-metaint`, so `IcyDataSource` is never
|
|
38
|
+
* installed and `onMetadata` stops firing: live "now playing" disappears on exactly the
|
|
39
|
+
* redirecting streams this interceptor exists for, and the interleaved metadata bytes stay in the
|
|
40
|
+
* audio as audible chirping. It is a request for a response format, never a credential.
|
|
41
|
+
*/
|
|
42
|
+
private val TRANSPORT_HEADERS =
|
|
43
|
+
setOf(
|
|
44
|
+
"accept",
|
|
45
|
+
"accept-encoding",
|
|
46
|
+
"connection",
|
|
47
|
+
"content-length",
|
|
48
|
+
"host",
|
|
49
|
+
"icy-metadata",
|
|
50
|
+
"range",
|
|
51
|
+
"transfer-encoding",
|
|
52
|
+
"user-agent",
|
|
53
|
+
)
|
|
54
|
+
|
|
55
|
+
override fun intercept(chain: Interceptor.Chain): Response {
|
|
56
|
+
val request = chain.request()
|
|
57
|
+
val addressed = chain.call().request().url
|
|
58
|
+
return chain.proceed(
|
|
59
|
+
if (sameOrigin(addressed, request.url)) request else stripCallerHeaders(request)
|
|
60
|
+
)
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** Scheme, host and port — the same origin test `followMediaRedirect` applies on web. */
|
|
64
|
+
internal fun sameOrigin(a: HttpUrl, b: HttpUrl): Boolean =
|
|
65
|
+
a.scheme == b.scheme && a.host == b.host && a.port == b.port
|
|
66
|
+
|
|
67
|
+
/** The request with every caller-supplied header removed. */
|
|
68
|
+
internal fun stripCallerHeaders(request: Request): Request =
|
|
69
|
+
request
|
|
70
|
+
.newBuilder()
|
|
71
|
+
.apply {
|
|
72
|
+
request.headers.names().forEach { name ->
|
|
73
|
+
if (name.lowercase() !in TRANSPORT_HEADERS) removeHeader(name)
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
.build()
|
|
77
|
+
}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
package com.audiobrowser.player
|
|
2
|
+
|
|
3
|
+
import androidx.media3.common.C
|
|
4
|
+
import androidx.media3.common.MediaItem
|
|
5
|
+
import androidx.media3.common.PlaybackParameters
|
|
6
|
+
import androidx.media3.common.Player as MediaPlayer
|
|
7
|
+
import androidx.media3.exoplayer.ExoPlayer
|
|
8
|
+
import androidx.media3.exoplayer.source.ShuffleOrder
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* What an engine is playing, and how: what [Player.setup] carries from the engine it releases to
|
|
12
|
+
* the one it builds, so new setup options don't stop playback.
|
|
13
|
+
*/
|
|
14
|
+
internal data class EnginePlayback(
|
|
15
|
+
val mediaItems: List<MediaItem>,
|
|
16
|
+
val index: Int,
|
|
17
|
+
/**
|
|
18
|
+
* [C.TIME_UNSET] for a live item, which resumes at the live edge, and for 0, which is also how a
|
|
19
|
+
* live item reads before it has loaded.
|
|
20
|
+
*/
|
|
21
|
+
val positionMs: Long,
|
|
22
|
+
val prepared: Boolean,
|
|
23
|
+
val playWhenReady: Boolean,
|
|
24
|
+
val repeatMode: Int,
|
|
25
|
+
val shuffleModeEnabled: Boolean,
|
|
26
|
+
val shuffleOrder: ShuffleOrder,
|
|
27
|
+
val playbackParameters: PlaybackParameters,
|
|
28
|
+
val volume: Float,
|
|
29
|
+
val skipSilenceEnabled: Boolean,
|
|
30
|
+
) {
|
|
31
|
+
fun restoreTo(exoPlayer: ExoPlayer) {
|
|
32
|
+
exoPlayer.repeatMode = repeatMode
|
|
33
|
+
exoPlayer.shuffleModeEnabled = shuffleModeEnabled
|
|
34
|
+
exoPlayer.playbackParameters = playbackParameters
|
|
35
|
+
exoPlayer.volume = volume
|
|
36
|
+
exoPlayer.skipSilenceEnabled = skipSilenceEnabled
|
|
37
|
+
if (mediaItems.isNotEmpty()) {
|
|
38
|
+
exoPlayer.setMediaItems(mediaItems, index, positionMs)
|
|
39
|
+
exoPlayer.setShuffleOrder(shuffleOrder)
|
|
40
|
+
if (prepared) exoPlayer.prepare()
|
|
41
|
+
}
|
|
42
|
+
exoPlayer.playWhenReady = playWhenReady
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
companion object {
|
|
46
|
+
fun of(exoPlayer: ExoPlayer) =
|
|
47
|
+
EnginePlayback(
|
|
48
|
+
mediaItems = (0 until exoPlayer.mediaItemCount).map { exoPlayer.getMediaItemAt(it) },
|
|
49
|
+
index = exoPlayer.currentMediaItemIndex,
|
|
50
|
+
positionMs =
|
|
51
|
+
exoPlayer.currentPosition.takeUnless { exoPlayer.isCurrentMediaItemLive || it == 0L }
|
|
52
|
+
?: C.TIME_UNSET,
|
|
53
|
+
prepared = exoPlayer.playbackState != MediaPlayer.STATE_IDLE,
|
|
54
|
+
playWhenReady = exoPlayer.playWhenReady,
|
|
55
|
+
repeatMode = exoPlayer.repeatMode,
|
|
56
|
+
shuffleModeEnabled = exoPlayer.shuffleModeEnabled,
|
|
57
|
+
shuffleOrder = exoPlayer.shuffleOrder,
|
|
58
|
+
playbackParameters = exoPlayer.playbackParameters,
|
|
59
|
+
volume = exoPlayer.volume,
|
|
60
|
+
skipSilenceEnabled = exoPlayer.skipSilenceEnabled,
|
|
61
|
+
)
|
|
62
|
+
}
|
|
63
|
+
}
|
|
@@ -4,18 +4,22 @@ import android.content.Context
|
|
|
4
4
|
import androidx.media3.common.MediaItem
|
|
5
5
|
import androidx.media3.datasource.DataSource
|
|
6
6
|
import androidx.media3.datasource.DefaultDataSource
|
|
7
|
-
import androidx.media3.datasource.DefaultHttpDataSource
|
|
8
7
|
import androidx.media3.datasource.TransferListener
|
|
9
8
|
import androidx.media3.datasource.cache.CacheDataSource
|
|
10
9
|
import androidx.media3.datasource.cache.SimpleCache
|
|
10
|
+
import androidx.media3.datasource.okhttp.OkHttpDataSource
|
|
11
11
|
import androidx.media3.exoplayer.drm.DrmSessionManagerProvider
|
|
12
12
|
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
|
|
13
13
|
import androidx.media3.exoplayer.source.MediaSource
|
|
14
14
|
import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
|
|
15
15
|
import androidx.media3.extractor.DefaultExtractorsFactory
|
|
16
16
|
import com.audiobrowser.model.RetryPolicy
|
|
17
|
+
import com.audiobrowser.util.TrackFactory
|
|
17
18
|
import com.margelo.nitro.audiobrowser.MediaRequestConfig
|
|
19
|
+
import com.margelo.nitro.audiobrowser.Track
|
|
18
20
|
import java.io.IOException
|
|
21
|
+
import java.util.concurrent.TimeUnit
|
|
22
|
+
import okhttp3.OkHttpClient
|
|
19
23
|
|
|
20
24
|
class MediaFactory(
|
|
21
25
|
private val context: Context,
|
|
@@ -26,11 +30,25 @@ class MediaFactory(
|
|
|
26
30
|
private val hasPlayed: () -> Boolean = { false },
|
|
27
31
|
private val onRetryPending: ((exception: IOException, isNetworkError: Boolean) -> Unit)? = null,
|
|
28
32
|
private val transferListener: TransferListener? = null,
|
|
29
|
-
private val getRequestConfig: (originalUrl: String) -> MediaRequestConfig?,
|
|
33
|
+
private val getRequestConfig: (originalUrl: String, track: Track) -> MediaRequestConfig?,
|
|
30
34
|
) : MediaSource.Factory {
|
|
31
35
|
|
|
32
36
|
companion object {
|
|
33
37
|
private const val DEFAULT_USER_AGENT = "react-native-audio-browser"
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* The client media requests go out on. One per process so connections are reused; not
|
|
41
|
+
* `HttpClient`'s browse client, whose read timeout is sized for JSON and would cut a long media
|
|
42
|
+
* read short. The timeouts are media3's own defaults, so stall detection and
|
|
43
|
+
* [RetryLoadErrorHandlingPolicy] behave as they did before.
|
|
44
|
+
*/
|
|
45
|
+
private val mediaHttpClient: OkHttpClient by lazy {
|
|
46
|
+
OkHttpClient.Builder()
|
|
47
|
+
.connectTimeout(8, TimeUnit.SECONDS)
|
|
48
|
+
.readTimeout(8, TimeUnit.SECONDS)
|
|
49
|
+
.addNetworkInterceptor(CrossOriginHeaderStripper)
|
|
50
|
+
.build()
|
|
51
|
+
}
|
|
34
52
|
}
|
|
35
53
|
|
|
36
54
|
private val extractorsFactory =
|
|
@@ -95,24 +113,28 @@ class MediaFactory(
|
|
|
95
113
|
// ExoPlayer's IO thread. This prevents deadlocks when the JS thread is blocked by
|
|
96
114
|
// synchronous Nitro calls (e.g., seekTo) while a media transform callback needs the
|
|
97
115
|
// JS thread to resolve.
|
|
116
|
+
|
|
117
|
+
// OkHttp rather than DefaultHttpDataSource, for how each treats a redirect.
|
|
118
|
+
// DefaultHttpDataSource re-applies the request headers on every hop, handing
|
|
119
|
+
// an Authorization header to whatever host the first one named. OkHttp drops
|
|
120
|
+
// that one header itself, and [CrossOriginHeaderStripper] drops the rest.
|
|
98
121
|
val httpFactory =
|
|
99
|
-
|
|
100
|
-
// Deliberately NOT setUserAgent():
|
|
101
|
-
//
|
|
102
|
-
//
|
|
103
|
-
//
|
|
104
|
-
//
|
|
105
|
-
// request property keeps the default for un-overridden requests while letting
|
|
106
|
-
// the per-request DataSpec header win.
|
|
122
|
+
OkHttpDataSource.Factory(mediaHttpClient).apply {
|
|
123
|
+
// Deliberately NOT setUserAgent(): it is applied last via addHeader(),
|
|
124
|
+
// which appends, so a request already carrying one would send two. As a
|
|
125
|
+
// default request property it is merged under dataSpec.httpRequestHeaders
|
|
126
|
+
// and applied with header(), letting TransformingDataSource's per-request
|
|
127
|
+
// override win.
|
|
107
128
|
setDefaultRequestProperties(mapOf("User-Agent" to DEFAULT_USER_AGENT))
|
|
108
|
-
setAllowCrossProtocolRedirects(true)
|
|
109
129
|
// Connect transfer listener for bandwidth measurement
|
|
110
130
|
transferListener?.let { setTransferListener(it) }
|
|
111
131
|
}
|
|
112
132
|
val baseFactory: DataSource.Factory = DefaultDataSource.Factory(context, httpFactory)
|
|
113
133
|
|
|
114
134
|
// Wrap with TransformingDataSource to resolve URLs on the IO thread
|
|
115
|
-
val
|
|
135
|
+
val track = TrackFactory.fromMedia3(mediaItem)
|
|
136
|
+
val transformingFactory =
|
|
137
|
+
TransformingDataSource.Factory(baseFactory) { url -> getRequestConfig(url, track) }
|
|
116
138
|
|
|
117
139
|
// Configure data source factory with optional caching
|
|
118
140
|
val dataSourceFactory =
|