react-native-audio-browser 0.2.0-next.4 → 0.2.0-next.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -22
- package/android/build.gradle +42 -15
- package/android/gradle.properties +2 -2
- package/android/src/main/AndroidManifest.xml +3 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +543 -280
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +38 -0
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +18 -2
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +131 -0
- package/android/src/main/java/com/audiobrowser/Service.kt +9 -6
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +315 -213
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +31 -23
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +288 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +97 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +70 -29
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +20 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +20 -3
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +4 -5
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +24 -0
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +10 -6
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +7 -0
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +12 -12
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +111 -58
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +77 -0
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +63 -0
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +34 -12
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +530 -230
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +218 -252
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +23 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +26 -14
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +113 -78
- package/android/src/main/java/com/audiobrowser/player/Player.kt +130 -63
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +12 -4
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +2 -1
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +67 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +168 -0
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +35 -7
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +278 -59
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +7 -9
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +62 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +6 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +110 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +56 -52
- package/android/src/main/res/values/strings.xml +25 -5
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +152 -0
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +101 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +123 -34
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +15 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +346 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +70 -5
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +301 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -55
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +160 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +49 -0
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +385 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +101 -58
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +94 -0
- package/android/src/test/java/com/audiobrowser/player/MediaFactoryTest.kt +71 -0
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +45 -0
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +3 -4
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +48 -16
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +92 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +185 -0
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +197 -7
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +325 -4
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +83 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +55 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +162 -0
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +6 -6
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/ios/AVPlayerEngine.swift +362 -0
- package/ios/AVPlayerEngineCallbacks.swift +14 -0
- package/ios/Browser/BrowseGate.swift +58 -0
- package/ios/Browser/BrowserConfig.swift +115 -81
- package/ios/Browser/BrowserError.swift +16 -0
- package/ios/Browser/BrowserManager.swift +155 -654
- package/ios/Browser/BrowserPathHelper.swift +68 -51
- package/ios/Browser/FavoriteSet.swift +46 -0
- package/ios/Browser/InertStyleDiagnostic.swift +296 -0
- package/ios/Browser/JsonModels.swift +270 -321
- package/ios/Browser/NavigationErrorState.swift +41 -0
- package/ios/Browser/PageResolver.swift +147 -0
- package/ios/Browser/RequestLayer.swift +185 -0
- package/ios/Browser/RequestPipeline.swift +303 -0
- package/ios/Browser/SearchDrillIn.swift +7 -7
- package/ios/Browser/SectionScope.swift +82 -23
- package/ios/Browser/SimpleRouter.swift +73 -144
- package/ios/Browser/StyleResolver.swift +58 -0
- package/ios/Browser/TabBarEntries.swift +9 -3
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CPInterfaceController+Safe.swift +93 -43
- package/ios/CarPlay/CarPlayArtworkResolver.swift +36 -83
- package/ios/CarPlay/CarPlayController.swift +37 -1297
- package/ios/CarPlay/CarPlayImageLoader.swift +91 -163
- package/ios/CarPlay/CarPlayListItemFactory.swift +288 -102
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +137 -177
- package/ios/CarPlay/CarPlaySession+Navigator.swift +103 -0
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +91 -0
- package/ios/CarPlay/CarPlaySession+Refresher.swift +43 -0
- package/ios/CarPlay/CarPlaySession+TabBar.swift +192 -0
- package/ios/CarPlay/CarPlaySession.swift +207 -0
- package/ios/CarPlay/CarPlayTemplates.swift +63 -0
- package/ios/CarPlay/IntentHandlers.swift +96 -0
- package/ios/CarPlay/MediaIntentCriteria.swift +105 -0
- package/ios/CarPlay/{RNABMediaIntentHandler.swift → MediaIntentHandler.swift} +21 -25
- package/ios/CarPlay/MediaIntentPlayback.swift +74 -0
- package/ios/CarPlay/NowPlayingButtonRules.swift +35 -0
- package/ios/CarPlay/RNABAudioBrowser.m +7 -15
- package/ios/CarPlay/SectionPresentation.swift +77 -0
- package/ios/CarPlay/TopTemplateReplacer.swift +96 -0
- package/ios/Extension/Capability+RemoteCommand.swift +22 -69
- package/ios/Extension/NavigationError+Conversion.swift +14 -4
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +13 -15
- package/ios/Extension/SearchParams+Query.swift +28 -0
- package/ios/Extension/Section+Copying.swift +29 -0
- package/ios/Extension/String+IcyCharset.swift +21 -0
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -4
- package/ios/Extension/Track+AVPlayer.swift +0 -16
- package/ios/Extension/Track+Copying.swift +11 -13
- package/ios/Extension/Track+Identity.swift +25 -0
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Extension/UIImage+Adaptive.swift +12 -0
- package/ios/Extension/URLError+Connectivity.swift +15 -0
- package/ios/Http/HttpClient.swift +71 -165
- package/ios/HybridAudioBrowser+Browser.swift +136 -0
- package/ios/HybridAudioBrowser+Options.swift +105 -0
- package/ios/HybridAudioBrowser+Player.swift +341 -0
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +157 -0
- package/ios/HybridAudioBrowser+Stubs.swift +46 -0
- package/ios/HybridAudioBrowser.swift +132 -1652
- package/ios/Model/NitroTypeStubs.swift +239 -24
- package/ios/Model/PlayerUpdateOptions.swift +10 -1
- package/ios/Model/RemoteCommand.swift +6 -60
- package/ios/Model/TrackPlayerError.swift +2 -2
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +18 -53
- package/ios/Observer/ItemObserver.swift +90 -0
- package/ios/Observer/PlayerObserver.swift +59 -0
- package/ios/Option/SessionCategories.swift +42 -92
- package/ios/Player/AudioSessionController.swift +191 -0
- package/ios/Player/DeferredSeek.swift +70 -0
- package/ios/Player/ErrorStatus.swift +50 -0
- package/ios/Player/MediaLoader.swift +66 -87
- package/ios/Player/NowPlayingLines.swift +36 -0
- package/ios/Player/NowPlayingUpdater.swift +180 -85
- package/ios/Player/PlaybackFailure.swift +125 -0
- package/ios/Player/PlaybackPersistence.swift +73 -0
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/Player.swift +960 -0
- package/ios/Player/{PlaybackCoordinatorCallbacks.swift → PlayerCallbacks.swift} +4 -8
- package/ios/Player/PlayerEngine.swift +104 -0
- package/ios/Player/PlayerStatusTypes.swift +2 -6
- package/ios/Player/QueueManager.swift +93 -67
- package/ios/Player/RetryLoop.swift +291 -0
- package/ios/Player/ShuffleOrder.swift +33 -0
- package/ios/Player/SleepTimerManager.swift +14 -16
- package/ios/Player/VolumeFader.swift +5 -0
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +43 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +100 -333
- package/ios/Tests/BrowserPathHelperTests.swift +89 -15
- package/ios/Tests/CapabilityRemoteCommandTests.swift +35 -0
- package/ios/Tests/CarPlayArtworkResolverTests.swift +60 -373
- package/ios/Tests/ConcurrentMapTests.swift +42 -0
- package/ios/Tests/DeferredSeekTests.swift +70 -0
- package/ios/Tests/EmitterTests.swift +22 -38
- package/ios/Tests/ErrorStatusTests.swift +50 -0
- package/ios/Tests/FavoriteSetTests.swift +60 -0
- package/ios/Tests/GenerationMemoTests.swift +121 -0
- package/ios/Tests/InertStyleDiagnosticTests.swift +209 -0
- package/ios/Tests/JsonModelsTests.swift +194 -1
- package/ios/Tests/LRUCacheTests.swift +110 -0
- package/ios/Tests/MediaIntentCriteriaTests.swift +57 -46
- package/ios/Tests/MediaLoaderTests.swift +36 -67
- package/ios/Tests/NowPlayingButtonRulesTests.swift +43 -0
- package/ios/Tests/NowPlayingLinesTests.swift +43 -0
- package/ios/Tests/ObserverTests.swift +88 -0
- package/ios/Tests/PlaybackErrorTests.swift +76 -0
- package/ios/Tests/PlaybackFailureTests.swift +189 -0
- package/ios/Tests/PlaybackPersistenceTests.swift +93 -0
- package/ios/Tests/PlayerPolicyTests.swift +460 -0
- package/ios/Tests/{PlaybackCoordinatorTests.swift → PlayerTests.swift} +489 -311
- package/ios/Tests/PlayingStateTests.swift +42 -0
- package/ios/Tests/QueueManagerTests.swift +196 -115
- package/ios/Tests/ReadyValueTests.swift +73 -0
- package/ios/Tests/RemoteCommandControllerTests.swift +181 -0
- package/ios/Tests/RequestLayerTests.swift +228 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +39 -35
- package/ios/Tests/RetryLoopTests.swift +305 -0
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SearchParamsQueryTests.swift +48 -0
- package/ios/Tests/SectionPresentationTests.swift +98 -0
- package/ios/Tests/SectionScopeTests.swift +139 -54
- package/ios/Tests/SimpleRouterTests.swift +38 -3
- package/ios/Tests/SleepTimerManagerTests.swift +65 -41
- package/ios/Tests/StyleResolverTests.swift +132 -0
- package/ios/Tests/Support/TestTypes.swift +146 -101
- package/ios/Tests/TabBarEntriesTests.swift +19 -19
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +42 -0
- package/ios/Tests/TopTemplateReplacerTests.swift +172 -0
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/Tests/URLErrorConnectivityTests.swift +20 -0
- package/ios/TrackSelector.swift +62 -65
- package/ios/Util/ArtworkImageFetcher.swift +58 -1
- package/ios/Util/ConcurrentMap.swift +19 -0
- package/ios/Util/Emitter.swift +40 -12
- package/ios/Util/GenerationMemo.swift +36 -0
- package/ios/Util/LRUCache.swift +23 -159
- package/ios/Util/NetworkMonitor.swift +32 -32
- package/ios/Util/OutputPicker.swift +48 -0
- package/ios/Util/ReadyValue.swift +56 -0
- package/ios/Util/SFSymbolRenderer.swift +59 -31
- package/ios/Util/SVGProcessor.swift +9 -12
- package/lib/commonjs/AudioBrowser.js +8 -8
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/CLAUDE.md +52 -0
- package/lib/commonjs/features/browser-config.js +12 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +11 -3
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +1 -1
- package/lib/commonjs/features/equalizer.js +1 -1
- package/lib/commonjs/features/errors.js +3 -3
- package/lib/commonjs/features/favorites.js +14 -11
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +16 -1
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +20 -3
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +1 -1
- package/lib/commonjs/features/nowPlaying.js +1 -1
- package/lib/commonjs/features/output.js +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +1 -1
- package/lib/commonjs/features/playback/playing.js +1 -1
- package/lib/commonjs/features/playback/progress.js +3 -2
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -4
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +0 -6
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +1 -1
- package/lib/commonjs/features/player/options.js +48 -34
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +18 -9
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +23 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -0
- package/lib/commonjs/features/queue/activeTrack.js +15 -4
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +13 -6
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +1 -1
- package/lib/commonjs/features/queue/shuffle.js +1 -1
- package/lib/commonjs/features/remoteControls.js +13 -92
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +13 -1
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/test-utils/reactNativeStub.js +65 -0
- package/lib/commonjs/test-utils/reactNativeStub.js.map +1 -0
- package/lib/commonjs/utils/LazyNativeEmitter.js +28 -14
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +202 -77
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js +37 -0
- package/lib/commonjs/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/commonjs/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/Player.js +254 -39
- package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js +33 -12
- package/lib/commonjs/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +175 -100
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js +3 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +18 -23
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/http/RequestConfigBuilder.js +110 -27
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/http/followMediaRedirect.js +219 -0
- package/lib/commonjs/web/http/followMediaRedirect.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +62 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +2 -1
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/CLAUDE.md +52 -0
- package/lib/module/features/browser-config.js +12 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +11 -3
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +1 -1
- package/lib/module/features/equalizer.js +1 -1
- package/lib/module/features/errors.js +3 -3
- package/lib/module/features/favorites.js +14 -11
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +16 -1
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +20 -3
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +1 -1
- package/lib/module/features/nowPlaying.js +1 -1
- package/lib/module/features/output.js +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +1 -1
- package/lib/module/features/playback/playing.js +1 -1
- package/lib/module/features/playback/progress.js +3 -2
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -4
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +0 -5
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +1 -1
- package/lib/module/features/player/options.js +47 -32
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +17 -8
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +19 -0
- package/lib/module/features/player/validateOptions.js.map +1 -0
- package/lib/module/features/queue/activeTrack.js +15 -4
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +13 -6
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +1 -1
- package/lib/module/features/queue/shuffle.js +1 -1
- package/lib/module/features/remoteControls.js +13 -92
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +13 -1
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/test-utils/reactNativeStub.js +58 -0
- package/lib/module/test-utils/reactNativeStub.js.map +1 -0
- package/lib/module/utils/LazyNativeEmitter.js +28 -14
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +202 -77
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/TrackPlayer/LoadAttempt.js +32 -0
- package/lib/module/web/TrackPlayer/LoadAttempt.js.map +1 -0
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js +18 -2
- package/lib/module/web/TrackPlayer/PlaybackStateMachine.js.map +1 -1
- package/lib/module/web/TrackPlayer/Player.js +254 -39
- package/lib/module/web/TrackPlayer/Player.js.map +1 -1
- package/lib/module/web/TrackPlayer/PlayingStateFactory.js +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueuePlayer.js +33 -12
- package/lib/module/web/TrackPlayer/QueuePlayer.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +175 -100
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/NavigationErrorManager.js +3 -1
- package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +18 -23
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/http/RequestConfigBuilder.js +110 -27
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/http/followMediaRedirect.js +215 -0
- package/lib/module/web/http/followMediaRedirect.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +62 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/package.json +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts +1 -1
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +10 -2
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +1 -1
- package/lib/typescript/src/features/errors.d.ts +3 -3
- package/lib/typescript/src/features/favorites.d.ts +14 -11
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +18 -2
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +20 -3
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
- package/lib/typescript/src/features/output.d.ts +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +3 -4
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +1 -1
- package/lib/typescript/src/features/player/options.d.ts +108 -56
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +14 -4
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +2 -0
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -0
- package/lib/typescript/src/features/queue/activeTrack.d.ts +9 -2
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +7 -4
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +23 -22
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts +36 -0
- package/lib/typescript/src/test-utils/reactNativeStub.d.ts.map +1 -0
- package/lib/typescript/src/types/browser-native.d.ts +3 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +387 -126
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +93 -61
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +19 -16
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/resolveAssetSource.d.ts +1 -2
- package/lib/typescript/src/utils/resolveAssetSource.d.ts.map +1 -1
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +1 -2
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +4 -2
- package/nitrogen/generated/android/c++/JAndroidAudioContentType.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidAudioOffloadSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JAndroidOptions.hpp +12 -12
- package/nitrogen/generated/android/c++/JAndroidPlayerWakeMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JAppKilledPlaybackBehavior.hpp +2 -2
- package/nitrogen/generated/android/c++/JArtworkRendering.hpp +58 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JArtworkVariants.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatus.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseError.hpp +2 -2
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +19 -7
- package/nitrogen/generated/android/c++/JBrowserSourceCallbackParam.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayNowPlayingButton.hpp +2 -2
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCarPlaySiriListButtonPosition.hpp +2 -2
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JChapterMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JEqualizerSettings.hpp +10 -10
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormatNavigationErrorParams.hpp +11 -5
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFormattedNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +9 -9
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +18 -12
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +10 -4
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +18 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryOptimizationStatusChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_BatteryWarningPendingChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_EqualizerSettings.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_GateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_NowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +9 -12
- package/nitrogen/generated/android/c++/JFunc_void_Output.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_Playback.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_PlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_RepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_TrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_FormattedNavigationError_.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +17 -5
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_ChapterMetadata_.hpp +16 -16
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +24 -18
- package/nitrogen/generated/android/c++/JGate.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateDecision.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JGateReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +64 -0
- package/nitrogen/generated/android/c++/JHttpMethod.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +77 -53
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +3 -3
- package/nitrogen/generated/android/c++/JIOSCategory.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSCategoryPolicy.hpp +2 -2
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JImageContext.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageQueryParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JImageSource.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaReference.hpp +2 -2
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +10 -5
- package/nitrogen/generated/android/c++/JMediaTransformParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeAndroidSetupOptions.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +48 -21
- package/nitrogen/generated/android/c++/JNativeGateRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JNativeIOSSetupOptions.hpp +10 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +16 -4
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +17 -14
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +9 -12
- package/nitrogen/generated/android/c++/JNavigationError.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JNavigationErrorKind.hpp +58 -0
- package/nitrogen/generated/android/c++/JNavigationErrorType.hpp +2 -2
- package/nitrogen/generated/android/c++/JNitroAndroidUpdateOptions.hpp +12 -12
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +17 -11
- package/nitrogen/generated/android/c++/JNowPlayingMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JNowPlayingUpdate.hpp +2 -2
- package/nitrogen/generated/android/c++/JOptions.hpp +9 -12
- package/nitrogen/generated/android/c++/JOutput.hpp +2 -2
- package/nitrogen/generated/android/c++/JOutputType.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayback.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +10 -5
- package/nitrogen/generated/android/c++/JPlaybackError.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackErrorKind.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackPlayWhenReadyChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackProgressUpdatedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackQueueEndedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlaybackState.hpp +2 -2
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +7 -13
- package/nitrogen/generated/android/c++/JPlayingState.hpp +2 -2
- package/nitrogen/generated/android/c++/JProgress.hpp +2 -2
- package/nitrogen/generated/android/c++/{JNotificationButton.hpp → JRemoteButton.hpp} +19 -19
- package/nitrogen/generated/android/c++/JRemoteButtonLayout.hpp +86 -0
- package/nitrogen/generated/android/c++/JRemoteJumpBackwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteJumpForwardEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlayIdEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemotePlaySearchEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSeekEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRemoteSkipEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JRepeatModeChangedEvent.hpp +2 -2
- package/nitrogen/generated/android/c++/JRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +67 -59
- package/nitrogen/generated/android/c++/JRetryConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchMode.hpp +2 -2
- package/nitrogen/generated/android/c++/JSearchParams.hpp +2 -2
- package/nitrogen/generated/android/c++/JSection.hpp +116 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
- package/nitrogen/generated/android/c++/JSleepTimer.hpp +4 -4
- package/nitrogen/generated/android/c++/JSleepTimerEndOfTrack.hpp +2 -2
- package/nitrogen/generated/android/c++/JSleepTimerTime.hpp +2 -2
- package/nitrogen/generated/android/c++/JStallReason.hpp +2 -2
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTimedMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrack.hpp +27 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +18 -12
- package/nitrogen/generated/android/c++/JTrackMetadata.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackRequest.hpp +2 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +47 -19
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +2 -2
- package/nitrogen/generated/android/c++/JVariant_Boolean_AndroidAudioOffloadSettings.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_Boolean_RetryConfig.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_Double.hpp +3 -3
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.cpp +26 -0
- package/nitrogen/generated/android/c++/JVariant_NullType_RemoteButtonLayout.hpp +75 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +20 -8
- package/nitrogen/generated/android/c++/JVariant_String_ArtworkVariants.hpp +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidAudioOffloadSettings.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt +20 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkRequestConfig.kt +37 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ArtworkVariants.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryOptimizationStatusChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BatteryWarningPendingChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseError.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowseResult.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/BrowserSourceCallbackParam.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ChapterMetadata.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/EqualizerSettings.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteChangedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNavigationErrorParams.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormatNowPlayingParams.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FormattedNavigationError.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_RequestConfig___Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__optional_std__string____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryOptimizationStatusChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_BatteryWarningPendingChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_EqualizerSettings.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_FavoriteChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_GateEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NavigationErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_NowPlayingMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Options.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Output.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_Playback.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackActiveTrackChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackErrorEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackPlayWhenReadyChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackProgressUpdatedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlaybackQueueEndedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_PlayingState.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpBackwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteJumpForwardEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlayIdEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemotePlaySearchEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSeekEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RemoteSkipEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_RepeatModeChangedEvent.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TimedMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_TrackMetadata.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_bool.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_double.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_FormattedNavigationError_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_ResolvedTrack_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__optional_std__variant_nitro__NullType__SleepTimerTime__SleepTimerEndOfTrack__.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__string.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_ChapterMetadata_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_void_std__vector_Track_.kt +0 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Gate.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateDecision.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GateEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +25 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +3 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageContext.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageQueryParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageSource.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaRequestConfig.kt +35 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/MediaTransformParams.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeAndroidSetupOptions.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +51 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeGateRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeIOSSetupOptions.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeRouteEntry.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeSetupPlayerOptions.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeUpdateOptions.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationError.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NavigationErrorKind.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt +20 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +25 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingMetadata.kt +29 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NowPlayingUpdate.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Options.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Output.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Playback.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackActiveTrackChangedEvent.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackError.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackErrorEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackPlayWhenReadyChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackProgressUpdatedEvent.kt +19 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlaybackQueueEndedEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +37 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayingState.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Progress.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{NotificationButton.kt → RemoteButton.kt} +3 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt +61 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpBackwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteJumpForwardEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlayIdEvent.kt +15 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemotePlaySearchEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSeekEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteSkipEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RepeatModeChangedEvent.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RequestConfig.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +67 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RetryConfig.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SearchParams.kt +27 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +66 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +86 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimer.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerEndOfTrack.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SleepTimerTime.kt +13 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TimedMetadata.kt +21 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +55 -12
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackLoadEvent.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackMetadata.kt +43 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackRequest.kt +17 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +58 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TransformableRequestConfig.kt +31 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_AndroidAudioOffloadSettings.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_RetryConfig.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_NullType_Double.kt +16 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{Variant_NullType_NotificationButtonLayout.kt → Variant_NullType_RemoteButtonLayout.kt} +24 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.kt +18 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_String_ArtworkVariants.kt +16 -7
- package/nitrogen/generated/ios/AudioBrowser+autolinking.rb +2 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +38 -29
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +779 -665
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +34 -16
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +36 -18
- package/nitrogen/generated/ios/swift/AndroidOptions.swift +12 -12
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/BrowseResult.swift +12 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/FormatNavigationErrorParams.swift +7 -2
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +48 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +52 -5
- package/nitrogen/generated/ios/swift/NavigationErrorKind.swift +40 -0
- package/nitrogen/generated/ios/swift/NitroAndroidUpdateOptions.swift +12 -12
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/{NotificationButton.swift → RemoteButton.swift} +6 -6
- package/nitrogen/generated/ios/swift/RemoteButtonLayout.swift +57 -0
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +62 -73
- package/nitrogen/generated/ios/swift/Section.swift +82 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
- package/nitrogen/generated/ios/swift/SleepTimer.swift +13 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +28 -63
- package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
- package/nitrogen/generated/ios/swift/Variant_Bool_AndroidAudioOffloadSettings.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_Bool_RetryConfig.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_Double.swift +12 -0
- package/nitrogen/generated/ios/swift/Variant_NullType_RemoteButtonLayout.swift +30 -0
- package/nitrogen/generated/ios/swift/Variant_ResolvedTrack_BrowseError_Promise_BrowseResult_.swift +13 -0
- package/nitrogen/generated/ios/swift/Variant_String_ArtworkVariants.swift +12 -0
- package/nitrogen/generated/shared/c++/AndroidOptions.hpp +8 -8
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/FormatNavigationErrorParams.hpp +9 -2
- package/nitrogen/generated/shared/c++/GridTile.hpp +84 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -6
- package/nitrogen/generated/shared/c++/NavigationErrorKind.hpp +76 -0
- package/nitrogen/generated/shared/c++/NitroAndroidUpdateOptions.hpp +8 -8
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/{NotificationButton.hpp → RemoteButton.hpp} +19 -19
- package/nitrogen/generated/shared/c++/RemoteButtonLayout.hpp +94 -0
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +33 -37
- package/nitrogen/generated/shared/c++/Section.hpp +102 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +18 -30
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
- package/package.json +24 -11
- package/src/AudioBrowser.ts +2 -1
- package/src/CLAUDE.md +52 -0
- package/src/features/battery.test.ts +79 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +12 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +11 -3
- package/src/features/carConnection.ts +1 -1
- package/src/features/equalizer.ts +1 -1
- package/src/features/errors.ts +3 -3
- package/src/features/favorites.ts +14 -11
- package/src/features/gate.ts +16 -1
- package/src/features/hook-wiring.test.ts +302 -0
- package/src/features/metadata.ts +20 -3
- package/src/features/network.ts +1 -1
- package/src/features/nowPlaying.ts +1 -1
- package/src/features/output.ts +1 -1
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/playWhenReady.ts +1 -1
- package/src/features/playback/playing.ts +1 -1
- package/src/features/playback/progress.test.ts +169 -0
- package/src/features/playback/progress.ts +3 -2
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +3 -4
- package/src/features/playback/trackPlaybackTime.test.ts +16 -6
- package/src/features/playback/trackPlaybackTime.ts +1 -6
- package/src/features/playback/volume.ts +1 -1
- package/src/features/player/options.ts +126 -76
- package/src/features/player/setup.test.ts +24 -7
- package/src/features/player/setup.ts +22 -10
- package/src/features/player/validateOptions.ts +21 -0
- package/src/features/queue/activeTrack.ts +15 -4
- package/src/features/queue/queue.ts +13 -6
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +1 -1
- package/src/features/remoteControls.ts +13 -92
- package/src/features/sleepTimer.test.ts +172 -0
- package/src/features/sleepTimer.ts +9 -1
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +147 -0
- package/src/specs/audio-browser.nitro.ts +5 -4
- package/src/style-resolution.test.ts +210 -0
- package/src/test-utils/reactNativeStub.ts +60 -0
- package/src/types/browser-native.ts +7 -3
- package/src/types/browser-nodes.ts +403 -134
- package/src/types/browser.ts +97 -63
- package/src/utils/LazyNativeEmitter.ts +28 -15
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useDebug.test.ts +182 -0
- package/src/utils/useNativeUpdatedValue.test.ts +103 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +232 -2
- package/src/web/NativeAudioBrowser.ts +241 -84
- package/src/web/TrackPlayer/LoadAttempt.ts +29 -0
- package/src/web/TrackPlayer/PlaybackStateMachine.test.ts +60 -13
- package/src/web/TrackPlayer/PlaybackStateMachine.ts +22 -6
- package/src/web/TrackPlayer/Player.dispatch.test.ts +5 -3
- package/src/web/TrackPlayer/Player.load.test.ts +137 -1
- package/src/web/TrackPlayer/Player.ts +284 -37
- package/src/web/TrackPlayer/PlayingStateFactory.test.ts +1 -1
- package/src/web/TrackPlayer/PlayingStateFactory.ts +1 -1
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/src/web/TrackPlayer/QueuePlayer.ts +33 -14
- package/src/web/__tests__/lifecycle.test.ts +345 -0
- package/src/web/__tests__/lifecycleHarness.ts +351 -0
- package/src/web/__tests__/loadEdgeCases.test.ts +246 -0
- package/src/web/__tests__/loadSupersession.test.ts +175 -0
- package/src/web/__tests__/retry.test.ts +169 -0
- package/src/web/browser/BrowserManager.ts +209 -111
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/NavigationErrorManager.ts +3 -1
- package/src/web/browser/SearchManager.test.ts +75 -0
- package/src/web/browser/SearchManager.ts +25 -28
- package/src/web/browser/__tests__/artwork-resolution.test.ts +117 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +35 -0
- package/src/web/browser/__tests__/search-artwork.test.ts +46 -0
- package/src/web/browser/__tests__/search-navigation.test.ts +76 -0
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/http/RequestConfigBuilder.test.ts +241 -1
- package/src/web/http/RequestConfigBuilder.ts +140 -33
- package/src/web/http/followMediaRedirect.test.ts +289 -0
- package/src/web/http/followMediaRedirect.ts +253 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +68 -0
- package/src/web/util/BrowserPathHelper.ts +70 -13
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +135 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +587 -0
- package/website/guide/carplay.md +650 -0
- package/website/guide/configuration.md +173 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +247 -0
- package/ios/Bridge.h +0 -8
- package/ios/Browser/BrowserManager+URLResolution.swift +0 -380
- package/ios/Browser/MediaResolveComposer.swift +0 -114
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/ios/CarPlay/RNABMediaAddHandler.swift +0 -75
- package/ios/CarPlay/RNABMediaAffinityHandler.swift +0 -69
- package/ios/Model/MediaURL.swift +0 -67
- package/ios/Model/SourceType.swift +0 -6
- package/ios/NowPlayingInfo/MediaItemProperty.swift +0 -78
- package/ios/NowPlayingInfo/NowPlayingInfoKeyValue.swift +0 -6
- package/ios/NowPlayingInfo/NowPlayingInfoProperty.swift +0 -220
- package/ios/Observer/PlayerItemNotificationObserver.swift +0 -119
- package/ios/Observer/PlayerItemPropertyObserver.swift +0 -133
- package/ios/Observer/PlayerStateObserver.swift +0 -50
- package/ios/Observer/PlayerTimeObserver.swift +0 -55
- package/ios/Option/PitchAlgorithms.swift +0 -17
- package/ios/Option/TimeEventFrequency.swift +0 -18
- package/ios/Player/LoadSeekCoordinator.swift +0 -99
- package/ios/Player/MediaIntentCriteria.swift +0 -139
- package/ios/Player/MediaLoaderDelegate.swift +0 -11
- package/ios/Player/PlaybackCoordinator.swift +0 -754
- package/ios/Player/PlaybackEffectHandler.swift +0 -54
- package/ios/Player/PlaybackErrorHandler.swift +0 -175
- package/ios/Player/PlaybackStateStore.swift +0 -27
- package/ios/Player/PlayingStateManager.swift +0 -33
- package/ios/Player/RetryManager.swift +0 -322
- package/ios/Player/SeekCompletionHandler.swift +0 -3
- package/ios/Player/SleepTimerHandling.swift +0 -15
- package/ios/Support/RNTrackPlayer-Bridging-Header.h +0 -7
- package/ios/Tests/LoadSeekCoordinatorTests.swift +0 -325
- package/ios/Tests/MediaResolveTests.swift +0 -126
- package/ios/Tests/OnceValueTests.swift +0 -79
- package/ios/Tests/PlaybackErrorHandlerTests.swift +0 -547
- package/ios/Tests/PlaybackStateStoreTests.swift +0 -48
- package/ios/Tests/PlayingStateManagerTests.swift +0 -57
- package/ios/Tests/RetryManagerTests.swift +0 -89
- package/ios/TrackPlayer.swift +0 -1014
- package/ios/TrackPlayerCallbacks.swift +0 -86
- package/ios/Util/MetadataAdapter.swift +0 -131
- package/ios/Util/OnceValue.swift +0 -104
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JFavoritesMatchMode.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JNotificationButtonLayout.hpp +0 -94
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_NullType_NotificationButtonLayout.hpp +0 -75
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FavoriteConfig.kt +0 -38
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NotificationButtonLayout.kt +0 -50
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/NotificationButtonLayout.swift +0 -92
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/ios/swift/Variant_NullType_NotificationButtonLayout.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
- package/nitrogen/generated/shared/c++/NotificationButtonLayout.hpp +0 -102
|
@@ -2,40 +2,29 @@ import CarPlay
|
|
|
2
2
|
import Foundation
|
|
3
3
|
import os.log
|
|
4
4
|
|
|
5
|
-
///
|
|
6
|
-
///
|
|
7
|
-
/// Responsibilities:
|
|
8
|
-
/// - CPNowPlayingTemplate setup and button configuration
|
|
9
|
-
/// - Button action handlers (shuffle, repeat, favorite, playback rate)
|
|
10
|
-
/// - Button state updates (favorite appearance, Up Next enabled)
|
|
11
|
-
/// - Up Next template creation and queue change handling
|
|
12
|
-
/// - NowPlayingObserver for Up Next button taps
|
|
5
|
+
/// The CarPlay Now Playing template for one session: its custom buttons, the album line's
|
|
6
|
+
/// destination, Up Next, and the events that refresh them.
|
|
13
7
|
@MainActor
|
|
14
8
|
final class CarPlayNowPlayingManager {
|
|
15
9
|
private let logger = Logger(subsystem: "com.audiobrowser", category: "CarPlayNowPlayingManager")
|
|
16
10
|
|
|
17
11
|
private let interfaceController: CPInterfaceController
|
|
18
|
-
|
|
19
|
-
///
|
|
20
|
-
var
|
|
21
|
-
|
|
22
|
-
|
|
12
|
+
private let audioBrowser: HybridAudioBrowser
|
|
13
|
+
/// Read on each use: a re-setup replaces the bridge's player.
|
|
14
|
+
private var player: Player? { audioBrowser.player }
|
|
15
|
+
private let listItem: (Track, ((CPSelectableListItem, @escaping () -> Void) -> Void)?) -> CPListItem
|
|
16
|
+
/// Pushes a browse destination: the album line's.
|
|
17
|
+
private let navigate: (_ path: String, _ title: String) -> Void
|
|
18
|
+
|
|
19
|
+
private var subscriptions: [Subscription] = []
|
|
23
20
|
private var nowPlayingObserver: NowPlayingObserver?
|
|
24
21
|
private weak var upNextTemplate: CPListTemplate?
|
|
25
|
-
///
|
|
26
|
-
///
|
|
27
|
-
/// skipped while this is unchanged (`onConfigChanged` fires on unrelated
|
|
28
|
-
/// churn, and every `updateNowPlayingButtons` call re-renders ALL buttons).
|
|
22
|
+
/// What the built button row renders. A rebuild is skipped while it is unchanged: every
|
|
23
|
+
/// `updateNowPlayingButtons` re-renders all the buttons.
|
|
29
24
|
///
|
|
30
|
-
///
|
|
31
|
-
///
|
|
32
|
-
///
|
|
33
|
-
/// stateful buttons first draw from their serialized `isSelected`, and only
|
|
34
|
-
/// then overlay the live state the app reports via the command center. A
|
|
35
|
-
/// button built with the default `isSelected = false` while repeat/shuffle
|
|
36
|
-
/// is on therefore flashes background-off → background-on at every
|
|
37
|
-
/// re-render. Stamping `isSelected` at build time (and rebuilding when the
|
|
38
|
-
/// mode changes) makes the first-frame render match the live state.
|
|
25
|
+
/// Shuffle and repeat carry their `isSelected` because CarPlay serializes the buttons to its
|
|
26
|
+
/// UI process and draws each re-render from the serialized state before the live one: a
|
|
27
|
+
/// button built unselected while its mode is on flashes off, then on.
|
|
39
28
|
private struct BuiltButtonRow: Equatable {
|
|
40
29
|
let types: [CarPlayNowPlayingButton]
|
|
41
30
|
let favorited: Bool?
|
|
@@ -46,11 +35,11 @@ final class CarPlayNowPlayingManager {
|
|
|
46
35
|
private var builtRow: BuiltButtonRow?
|
|
47
36
|
|
|
48
37
|
/// Browse path the album line navigates to for the active track —
|
|
49
|
-
/// `track.
|
|
38
|
+
/// `track.albumPath`, or the pre-resolved `resolveAlbumPath` result. Resolved
|
|
50
39
|
/// at track-change time (not at tap) so the album line only surfaces when a
|
|
51
40
|
/// destination actually exists.
|
|
52
41
|
private var albumArtistDestination: String?
|
|
53
|
-
/// Drops a stale async `
|
|
42
|
+
/// Drops a stale async `resolveAlbumPath` result when the track changed while
|
|
54
43
|
/// the resolver was in flight (latest-update-wins).
|
|
55
44
|
private var albumArtistGeneration: UInt = 0
|
|
56
45
|
/// The just-tapped track whose load is still in flight. CarPlay reads
|
|
@@ -60,72 +49,88 @@ final class CarPlayNowPlayingManager {
|
|
|
60
49
|
/// from the tapped track at push time. Cleared when the active track changes.
|
|
61
50
|
private var pendingAlbumArtistTrack: Track?
|
|
62
51
|
|
|
63
|
-
/// Convenience accessor for browser config
|
|
64
52
|
private var config: BrowserConfig {
|
|
65
|
-
audioBrowser
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
/// The active track's favorited state, from the authoritative favorite set
|
|
69
|
-
/// (see `HybridAudioBrowser.isActiveTrackFavorited`).
|
|
70
|
-
private var isActiveTrackFavorited: Bool {
|
|
71
|
-
audioBrowser?.isActiveTrackFavorited() ?? false
|
|
53
|
+
audioBrowser.browserManager.config
|
|
72
54
|
}
|
|
73
55
|
|
|
74
|
-
init(
|
|
56
|
+
init(
|
|
57
|
+
interfaceController: CPInterfaceController,
|
|
58
|
+
audioBrowser: HybridAudioBrowser,
|
|
59
|
+
listItem: @escaping (Track, ((CPSelectableListItem, @escaping () -> Void) -> Void)?) -> CPListItem,
|
|
60
|
+
navigate: @escaping (_ path: String, _ title: String) -> Void,
|
|
61
|
+
) {
|
|
75
62
|
self.interfaceController = interfaceController
|
|
76
|
-
self.
|
|
63
|
+
self.audioBrowser = audioBrowser
|
|
64
|
+
self.listItem = listItem
|
|
65
|
+
self.navigate = navigate
|
|
77
66
|
}
|
|
78
67
|
|
|
79
68
|
// MARK: - Lifecycle
|
|
80
69
|
|
|
81
|
-
func
|
|
82
|
-
|
|
83
|
-
|
|
70
|
+
func start() {
|
|
71
|
+
let observer = NowPlayingObserver(manager: self)
|
|
72
|
+
nowPlayingObserver = observer
|
|
73
|
+
CPNowPlayingTemplate.shared.add(observer)
|
|
74
|
+
|
|
75
|
+
let browserManager = audioBrowser.browserManager
|
|
76
|
+
subscriptions = [
|
|
77
|
+
browserManager.configChanged.subscribeOnMain { [weak self] _ in self?.refresh() },
|
|
78
|
+
audioBrowser.playerOptionsChangedEmitter.subscribeOnMain { [weak self] in self?.refresh() },
|
|
79
|
+
browserManager.favoritesChanged.subscribeOnMain { [weak self] in self?.refreshButtons() },
|
|
80
|
+
audioBrowser.favoriteChangedEmitter.subscribeOnMain { [weak self] _ in self?.refreshButtons() },
|
|
81
|
+
audioBrowser.repeatModeChangedEmitter.subscribeOnMain { [weak self] _ in self?.refreshButtons() },
|
|
82
|
+
audioBrowser.shuffleChangedEmitter.subscribeOnMain { [weak self] _ in self?.refreshButtons() },
|
|
83
|
+
audioBrowser.queueChangedEmitter.subscribeOnMain { [weak self] in self?.queueChanged($0) },
|
|
84
|
+
audioBrowser.showNowPlayingRequestedEmitter.subscribeOnMain { [weak self] in self?.showNowPlaying() },
|
|
85
|
+
audioBrowser.activeTrackChangedEmitter.subscribeOnMain { [weak self] _ in
|
|
86
|
+
// The player's current track is authoritative again.
|
|
87
|
+
self?.pendingAlbumArtistTrack = nil
|
|
88
|
+
self?.refresh()
|
|
89
|
+
},
|
|
90
|
+
]
|
|
91
|
+
refresh()
|
|
84
92
|
}
|
|
85
93
|
|
|
86
|
-
func
|
|
87
|
-
if let
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
}
|
|
94
|
+
func end() {
|
|
95
|
+
if let nowPlayingObserver { CPNowPlayingTemplate.shared.remove(nowPlayingObserver) }
|
|
96
|
+
nowPlayingObserver = nil
|
|
97
|
+
subscriptions = []
|
|
91
98
|
pendingAlbumArtistTrack = nil
|
|
92
|
-
|
|
99
|
+
// A resolve still in flight must not set the shared template for the next session.
|
|
100
|
+
albumArtistGeneration &+= 1
|
|
93
101
|
}
|
|
94
102
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
nowPlayingObserver = observer
|
|
102
|
-
template.add(observer)
|
|
103
|
+
/// Re-renders Up Next availability, the custom buttons and the album line's destination.
|
|
104
|
+
func refresh() {
|
|
105
|
+
updateUpNextButton()
|
|
106
|
+
refreshButtons()
|
|
107
|
+
updateAlbumArtistDestination()
|
|
108
|
+
}
|
|
103
109
|
|
|
104
|
-
|
|
105
|
-
|
|
110
|
+
/// Marks `track` as the just-tapped (still loading) track and derives the album line's
|
|
111
|
+
/// destination from it. Call before pushing Now Playing: CarPlay reads
|
|
112
|
+
/// `isAlbumArtistButtonEnabled` at display time, so enabling it after the push renders no
|
|
113
|
+
/// chevron.
|
|
114
|
+
func prepare(for track: Track) {
|
|
115
|
+
pendingAlbumArtistTrack = track
|
|
116
|
+
updateAlbumArtistDestination()
|
|
106
117
|
}
|
|
107
118
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
//
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
var deduped: [CarPlayNowPlayingButton] = []
|
|
119
|
-
for button in configured where !deduped.contains(button) {
|
|
120
|
-
deduped.append(button)
|
|
121
|
-
}
|
|
122
|
-
let buttons = Array(deduped.prefix(5))
|
|
123
|
-
let player = audioBrowser?.getPlayer()
|
|
119
|
+
// MARK: - Buttons
|
|
120
|
+
|
|
121
|
+
/// Builds the custom button row from the configuration and player state, skipping the
|
|
122
|
+
/// rebuild when nothing the row renders changed.
|
|
123
|
+
private func refreshButtons() {
|
|
124
|
+
// A gate hides the custom buttons; the transport controls stay, as a gate never blocks
|
|
125
|
+
// playback.
|
|
126
|
+
let buttons = NowPlayingButtonRules.buttons(
|
|
127
|
+
audioBrowser.browseGate.isActive ? [] : audioBrowser.playerOptions.carPlayNowPlayingButtons,
|
|
128
|
+
)
|
|
124
129
|
let row = BuiltButtonRow(
|
|
125
130
|
types: buttons,
|
|
126
|
-
favorited: buttons.contains(.favorite) ? isActiveTrackFavorited : nil,
|
|
127
|
-
shuffleSelected: buttons.contains(.shuffle) ?
|
|
128
|
-
repeatSelected: buttons.contains(.repeat) ? (player?.
|
|
131
|
+
favorited: buttons.contains(.favorite) ? audioBrowser.isActiveTrackFavorited() : nil,
|
|
132
|
+
shuffleSelected: buttons.contains(.shuffle) ? player?.shuffleEnabled ?? false : nil,
|
|
133
|
+
repeatSelected: buttons.contains(.repeat) ? (player?.repeatMode ?? .off) != .off : nil,
|
|
129
134
|
)
|
|
130
135
|
guard row != builtRow else { return }
|
|
131
136
|
builtRow = row
|
|
@@ -182,10 +187,10 @@ final class CarPlayNowPlayingManager {
|
|
|
182
187
|
/// stack but buried under templates pushed on top of it (Up Next, the album
|
|
183
188
|
/// line's browse destination): a user-initiated surface (tap, voice play)
|
|
184
189
|
/// pops back to it, while the deferred post-resolve calls in
|
|
185
|
-
/// `
|
|
190
|
+
/// `CarPlaySession.select` pass `false` — they run seconds after the tap, and
|
|
186
191
|
/// popping then would yank away a screen the user navigated to meanwhile.
|
|
187
192
|
func showNowPlaying(popToFront: Bool = true) {
|
|
188
|
-
|
|
193
|
+
refresh()
|
|
189
194
|
let nowPlayingTemplate = CPNowPlayingTemplate.shared
|
|
190
195
|
if interfaceController.templates.contains(where: { $0 === nowPlayingTemplate }) {
|
|
191
196
|
if popToFront {
|
|
@@ -196,58 +201,28 @@ final class CarPlayNowPlayingManager {
|
|
|
196
201
|
}
|
|
197
202
|
}
|
|
198
203
|
|
|
199
|
-
// MARK: -
|
|
200
|
-
|
|
201
|
-
/// Refreshes the row for a favorite/shuffle/repeat state change — the
|
|
202
|
-
/// snapshot diff in setupNowPlayingButtons makes this a no-op when nothing
|
|
203
|
-
/// the row renders actually changed.
|
|
204
|
-
func updateFavoriteButtonState() {
|
|
205
|
-
setupNowPlayingButtons()
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
/// Updates Now Playing button states based on config and current queue
|
|
209
|
-
func updateNowPlayingButtonStates() {
|
|
210
|
-
updateNowPlayingUpNextButton()
|
|
211
|
-
setupNowPlayingButtons()
|
|
212
|
-
updateAlbumArtistButtonState()
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
/// Re-resolves the album line's destination for the active track and
|
|
216
|
-
/// enables the (tappable) album/artist button only when one exists:
|
|
217
|
-
/// `track.albumUrl`, or the app's `resolveAlbumUrl` result.
|
|
218
|
-
/// Marks `track` as the just-tapped (still loading) track and derives the
|
|
219
|
-
/// album line's destination from it. Must run before the Now Playing
|
|
220
|
-
/// template is pushed — CarPlay reads `isAlbumArtistButtonEnabled` at display
|
|
221
|
-
/// time, so enabling after the push (when the load lands) renders no chevron.
|
|
222
|
-
func prepareAlbumArtistButton(for track: Track) {
|
|
223
|
-
pendingAlbumArtistTrack = track
|
|
224
|
-
updateAlbumArtistButtonState()
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
/// Clears the tap-time pending track (the player's `currentTrack` is now
|
|
228
|
-
/// authoritative) and refreshes all button states.
|
|
229
|
-
func handleActiveTrackChanged() {
|
|
230
|
-
pendingAlbumArtistTrack = nil
|
|
231
|
-
updateNowPlayingButtonStates()
|
|
232
|
-
}
|
|
204
|
+
// MARK: - Album Line
|
|
233
205
|
|
|
234
|
-
|
|
206
|
+
/// Resolves the album line's destination for the active (or just-tapped) track and enables
|
|
207
|
+
/// the album/artist button only when one exists: `track.albumPath`, or the app's
|
|
208
|
+
/// `resolveAlbumPath` result.
|
|
209
|
+
private func updateAlbumArtistDestination() {
|
|
235
210
|
albumArtistGeneration &+= 1
|
|
236
211
|
let generation = albumArtistGeneration
|
|
237
212
|
|
|
238
213
|
// The just-tapped track wins while its load is in flight: currentTrack
|
|
239
214
|
// still points at the previous track (or nil) at push time.
|
|
240
|
-
guard let track = pendingAlbumArtistTrack ??
|
|
215
|
+
guard let track = pendingAlbumArtistTrack ?? player?.currentTrack else {
|
|
241
216
|
logger.debug("AlbumArtist: no current track → disabled")
|
|
242
217
|
setAlbumArtistDestination(nil)
|
|
243
218
|
return
|
|
244
219
|
}
|
|
245
|
-
logger.info("AlbumArtist: track=\(track.title)
|
|
246
|
-
if let
|
|
247
|
-
setAlbumArtistDestination(
|
|
220
|
+
logger.info("AlbumArtist: track=\(track.title) albumPath=\(track.albumPath ?? "nil") resolver=\(self.config.resolveAlbumPath != nil)")
|
|
221
|
+
if let albumPath = track.albumPath {
|
|
222
|
+
setAlbumArtistDestination(albumPath)
|
|
248
223
|
return
|
|
249
224
|
}
|
|
250
|
-
guard let resolver = config.
|
|
225
|
+
guard let resolver = config.resolveAlbumPath else {
|
|
251
226
|
setAlbumArtistDestination(nil)
|
|
252
227
|
return
|
|
253
228
|
}
|
|
@@ -256,7 +231,7 @@ final class CarPlayNowPlayingManager {
|
|
|
256
231
|
do {
|
|
257
232
|
path = try await resolver(track).await()
|
|
258
233
|
} catch {
|
|
259
|
-
self?.logger.error("
|
|
234
|
+
self?.logger.error("resolveAlbumPath failed: \(error.localizedDescription)")
|
|
260
235
|
path = nil
|
|
261
236
|
}
|
|
262
237
|
guard let self, self.albumArtistGeneration == generation else { return }
|
|
@@ -276,18 +251,10 @@ final class CarPlayNowPlayingManager {
|
|
|
276
251
|
|
|
277
252
|
// MARK: - Queue Changes
|
|
278
253
|
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
guard let template = upNextTemplate,
|
|
284
|
-
let player = audioBrowser?.getPlayer()
|
|
285
|
-
else {
|
|
286
|
-
return
|
|
287
|
-
}
|
|
288
|
-
|
|
289
|
-
logger.debug("Queue changed, updating Up Next list with \(tracks.count) tracks")
|
|
290
|
-
template.updateSections([createUpNextSection(tracks: tracks, player: player)])
|
|
254
|
+
private func queueChanged(_ tracks: [Track]) {
|
|
255
|
+
updateUpNextButton()
|
|
256
|
+
guard let upNextTemplate else { return }
|
|
257
|
+
upNextTemplate.updateSections([createUpNextSection(tracks: tracks)])
|
|
291
258
|
}
|
|
292
259
|
|
|
293
260
|
// MARK: - Private - Button Handlers
|
|
@@ -295,58 +262,43 @@ final class CarPlayNowPlayingManager {
|
|
|
295
262
|
/// Returns the appropriate image for the favorite button based on state
|
|
296
263
|
private func favoriteButtonImage(isFavorited: Bool) -> UIImage {
|
|
297
264
|
let symbolName = isFavorited ? "heart.fill" : "heart"
|
|
298
|
-
guard let image = UIImage(systemName: symbolName)?.
|
|
265
|
+
guard let image = UIImage(systemName: symbolName)?.fitted(
|
|
266
|
+
to: CPNowPlayingButtonMaximumImageSize,
|
|
267
|
+
scale: interfaceController.carTraitCollection.displayScale,
|
|
268
|
+
) else {
|
|
299
269
|
return UIImage()
|
|
300
270
|
}
|
|
301
271
|
return image
|
|
302
272
|
}
|
|
303
273
|
|
|
304
274
|
private func handleShuffleButtonTapped() {
|
|
305
|
-
guard let player
|
|
306
|
-
|
|
275
|
+
guard let player else { return }
|
|
307
276
|
let newEnabled = !player.shuffleEnabled
|
|
308
277
|
player.shuffleEnabled = newEnabled
|
|
309
278
|
logger.info("CarPlay shuffle mode changed: \(newEnabled)")
|
|
310
279
|
}
|
|
311
280
|
|
|
312
281
|
private func handleRepeatButtonTapped() {
|
|
313
|
-
guard let player
|
|
314
|
-
|
|
315
|
-
let
|
|
316
|
-
|
|
317
|
-
case .off:
|
|
318
|
-
.track
|
|
319
|
-
case .track:
|
|
320
|
-
.queue
|
|
321
|
-
case .queue:
|
|
322
|
-
.off
|
|
323
|
-
}
|
|
324
|
-
|
|
325
|
-
player.setRepeatMode(newMode)
|
|
282
|
+
guard let player else { return }
|
|
283
|
+
let currentMode = player.repeatMode
|
|
284
|
+
let newMode = NowPlayingButtonRules.repeatMode(after: currentMode)
|
|
285
|
+
player.repeatMode = newMode
|
|
326
286
|
logger.info("CarPlay repeat mode changed: \(currentMode.stringValue) → \(newMode.stringValue)")
|
|
327
287
|
}
|
|
328
288
|
|
|
329
289
|
private func handleFavoriteButtonTapped() {
|
|
330
|
-
|
|
290
|
+
do {
|
|
291
|
+
try audioBrowser.toggleActiveTrackFavorited()
|
|
292
|
+
} catch {
|
|
293
|
+
logger.error("favorite toggle failed: \(error.localizedDescription)")
|
|
294
|
+
}
|
|
331
295
|
logger.info("CarPlay favorite toggled")
|
|
332
296
|
}
|
|
333
297
|
|
|
334
298
|
private func handlePlaybackRateButtonTapped() {
|
|
335
|
-
guard let
|
|
336
|
-
|
|
337
|
-
let rates = audioBrowser.playbackRates
|
|
338
|
-
guard !rates.isEmpty else { return }
|
|
339
|
-
|
|
299
|
+
guard let player else { return }
|
|
340
300
|
let currentRate = Double(player.rate)
|
|
341
|
-
let nextRate:
|
|
342
|
-
|
|
343
|
-
if let currentIndex = rates.firstIndex(where: { (currentRate - $0).magnitude < 0.01 }) {
|
|
344
|
-
let nextIndex = (currentIndex + 1) % rates.count
|
|
345
|
-
nextRate = rates[nextIndex]
|
|
346
|
-
} else {
|
|
347
|
-
nextRate = rates.first { $0 > currentRate } ?? rates[0]
|
|
348
|
-
}
|
|
349
|
-
|
|
301
|
+
guard let nextRate = NowPlayingButtonRules.rate(after: currentRate, in: audioBrowser.playerOptions.playbackRates) else { return }
|
|
350
302
|
player.rate = Float(nextRate)
|
|
351
303
|
logger.info("CarPlay playback rate changed: \(currentRate) → \(nextRate)")
|
|
352
304
|
}
|
|
@@ -355,26 +307,20 @@ final class CarPlayNowPlayingManager {
|
|
|
355
307
|
|
|
356
308
|
fileprivate func handleAlbumArtistButtonTapped() {
|
|
357
309
|
guard let destination = albumArtistDestination else { return }
|
|
358
|
-
let track = pendingAlbumArtistTrack ??
|
|
310
|
+
let track = pendingAlbumArtistTrack ?? player?.currentTrack
|
|
359
311
|
// The album line is what was tapped, so its text is the natural title for
|
|
360
312
|
// the pushed destination (artist may be unset, or the live song).
|
|
361
313
|
let title = track?.album ?? track?.artist ?? track?.title ?? ""
|
|
362
314
|
logger.info("Album/Artist button tapped, navigating to \(destination)")
|
|
363
|
-
|
|
315
|
+
navigate(destination, title)
|
|
364
316
|
}
|
|
365
317
|
|
|
366
|
-
private func
|
|
367
|
-
|
|
368
|
-
template.isUpNextButtonEnabled = (audioBrowser?.carPlayUpNextButton ?? true) && (audioBrowser?.getPlayer()?.tracks.count ?? 0) > 1
|
|
318
|
+
private func updateUpNextButton() {
|
|
319
|
+
CPNowPlayingTemplate.shared.isUpNextButtonEnabled = audioBrowser.playerOptions.carPlayUpNextButton && (player?.tracks.count ?? 0) > 1
|
|
369
320
|
}
|
|
370
321
|
|
|
371
322
|
fileprivate func handleUpNextButtonTapped() {
|
|
372
|
-
|
|
373
|
-
logger.warning("Player not available for Up Next")
|
|
374
|
-
return
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
let tracks = player.tracks
|
|
323
|
+
let tracks = player?.tracks ?? []
|
|
378
324
|
|
|
379
325
|
guard !tracks.isEmpty else {
|
|
380
326
|
logger.debug("No tracks in queue for Up Next")
|
|
@@ -389,7 +335,7 @@ final class CarPlayNowPlayingManager {
|
|
|
389
335
|
let upNextTitle = CPNowPlayingTemplate.shared.upNextTitle
|
|
390
336
|
let template = CPListTemplate(
|
|
391
337
|
title: upNextTitle.isEmpty ? "Up Next" : upNextTitle,
|
|
392
|
-
sections: [createUpNextSection(tracks: tracks
|
|
338
|
+
sections: [createUpNextSection(tracks: tracks)],
|
|
393
339
|
)
|
|
394
340
|
|
|
395
341
|
upNextTemplate = template
|
|
@@ -397,7 +343,7 @@ final class CarPlayNowPlayingManager {
|
|
|
397
343
|
interfaceController.safePush(template, animated: true)
|
|
398
344
|
}
|
|
399
345
|
|
|
400
|
-
private func createUpNextSection(tracks: [Track]
|
|
346
|
+
private func createUpNextSection(tracks: [Track]) -> CPListSection {
|
|
401
347
|
// Clamp to CarPlay's list limit (createSections does the same for browse
|
|
402
348
|
// lists). Taking the prefix keeps item positions aligned with queue indices.
|
|
403
349
|
let maxItems = CPListTemplate.maximumItemCount
|
|
@@ -405,10 +351,10 @@ final class CarPlayNowPlayingManager {
|
|
|
405
351
|
logger.info("Up Next queue has \(tracks.count) tracks, clamping to CarPlay's limit of \(maxItems)")
|
|
406
352
|
}
|
|
407
353
|
let items = tracks.prefix(maxItems).enumerated().map { index, track -> CPListItem in
|
|
408
|
-
|
|
354
|
+
listItem(track) { [weak self] _, completion in
|
|
409
355
|
self?.logger.info("Skipping to track at index \(index): \(track.title)")
|
|
410
356
|
do {
|
|
411
|
-
try player
|
|
357
|
+
try self?.player?.skipTo(index, playWhenReady: true)
|
|
412
358
|
} catch {
|
|
413
359
|
self?.logger.error("Failed to skip to track: \(error.localizedDescription)")
|
|
414
360
|
}
|
|
@@ -444,3 +390,17 @@ private final class NowPlayingObserver: NSObject, CPNowPlayingTemplateObserver,
|
|
|
444
390
|
}
|
|
445
391
|
}
|
|
446
392
|
}
|
|
393
|
+
|
|
394
|
+
private extension UIImage {
|
|
395
|
+
/// Draws the image centered in `targetSize`, keeping its aspect ratio, at the car screen's
|
|
396
|
+
/// display scale.
|
|
397
|
+
func fitted(to targetSize: CGSize, scale: CGFloat) -> UIImage? {
|
|
398
|
+
UIGraphicsBeginImageContextWithOptions(targetSize, false, scale)
|
|
399
|
+
defer { UIGraphicsEndImageContext() }
|
|
400
|
+
let fitScale = min(targetSize.width / size.width, targetSize.height / size.height)
|
|
401
|
+
let scaledSize = CGSize(width: size.width * fitScale, height: size.height * fitScale)
|
|
402
|
+
let origin = CGPoint(x: (targetSize.width - scaledSize.width) / 2, y: (targetSize.height - scaledSize.height) / 2)
|
|
403
|
+
draw(in: CGRect(origin: origin, size: scaledSize))
|
|
404
|
+
return UIGraphicsGetImageFromCurrentImageContext()?.withRenderingMode(.alwaysTemplate)
|
|
405
|
+
}
|
|
406
|
+
}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import CarPlay
|
|
2
|
+
import NitroModules
|
|
3
|
+
|
|
4
|
+
extension CarPlaySession {
|
|
5
|
+
/// A row or tile was tapped. CarPlay is released at once, so the list never locks: a browse
|
|
6
|
+
/// pushes its destination and fills it in, and playback owns its loading state on Now Playing.
|
|
7
|
+
func select(_ track: Track, completion: @escaping () -> Void) {
|
|
8
|
+
logger.info("Selected track: \(track.title)")
|
|
9
|
+
// A tap queued before `end()`: the next run owns the screen.
|
|
10
|
+
guard !ended else {
|
|
11
|
+
completion()
|
|
12
|
+
return
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
if track.src != nil, let identity = track.identity, player?.currentTrack?.identity == identity {
|
|
16
|
+
try? audioBrowser.play()
|
|
17
|
+
nowPlaying.showNowPlaying()
|
|
18
|
+
completion()
|
|
19
|
+
return
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
// A playable track always lands on Now Playing, so it is pushed now with the tapped
|
|
23
|
+
// track's fields: the queue expansion and media resolve may both hit the network.
|
|
24
|
+
if track.src != nil {
|
|
25
|
+
player?.previewNowPlaying(track)
|
|
26
|
+
nowPlaying.prepare(for: track)
|
|
27
|
+
nowPlaying.showNowPlaying()
|
|
28
|
+
}
|
|
29
|
+
completion()
|
|
30
|
+
|
|
31
|
+
spawn { session in
|
|
32
|
+
guard let player = session.player else { return }
|
|
33
|
+
let result = await session.trackSelector.select(track: track, player: player)
|
|
34
|
+
guard !Task.isCancelled else {
|
|
35
|
+
if track.src != nil { session.player?.endNowPlayingPreview() }
|
|
36
|
+
return
|
|
37
|
+
}
|
|
38
|
+
switch result {
|
|
39
|
+
case let .play(intent):
|
|
40
|
+
session.player?.execute(intent)
|
|
41
|
+
session.nowPlaying.showNowPlaying(popToFront: false)
|
|
42
|
+
case .intercepted:
|
|
43
|
+
session.nowPlaying.showNowPlaying(popToFront: false)
|
|
44
|
+
case let .browse(path):
|
|
45
|
+
await session.navigate(to: path, title: track.title)
|
|
46
|
+
case .none:
|
|
47
|
+
break
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/// Pushes `path`'s page as an empty, spinning template that fills in once it appears; or the
|
|
53
|
+
/// Browse Gate's page when the gate gates it; or selects the tab that is that path.
|
|
54
|
+
func navigate(to path: String, title: String) async {
|
|
55
|
+
// A push lands asynchronously, so a double tap is caught by `navigatingPaths` until the
|
|
56
|
+
// pushed template appears.
|
|
57
|
+
guard interfaceController.topTemplate?.carPlayInfo?.path != path, !navigatingPaths.contains(path) else { return }
|
|
58
|
+
navigatingPaths.insert(path)
|
|
59
|
+
var pushing = false
|
|
60
|
+
defer { if !pushing { navigatingPaths.remove(path) } }
|
|
61
|
+
|
|
62
|
+
let chrome = audioBrowser.browseGate.isActive ? await gate(.browse, path: path) : nil
|
|
63
|
+
guard !Task.isCancelled else { return }
|
|
64
|
+
let template: CPTemplate
|
|
65
|
+
if let chrome {
|
|
66
|
+
template = makeGatePage(chrome, path: path, tab: nil)
|
|
67
|
+
} else if selectTab(owning: path) {
|
|
68
|
+
return
|
|
69
|
+
} else {
|
|
70
|
+
template = CPListTemplate.loading(title: title, path: path, loadingTitle: config.carPlayLoadingTitle)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
pushing = true
|
|
74
|
+
interfaceController.safePush(template, animated: true) { [weak self] pushed, error in
|
|
75
|
+
guard !pushed else { return }
|
|
76
|
+
// It will never appear to clear the guard (e.g. at the depth limit).
|
|
77
|
+
self?.navigatingPaths.remove(path)
|
|
78
|
+
if let error { self?.logger.error("pushTemplate failed for \(path): \(error.localizedDescription)") }
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/// Switches to the tab whose path this is, popping any pushed stack first, instead of pushing
|
|
83
|
+
/// a second copy of the tab into another tab's stack. False when no tab has the path, when
|
|
84
|
+
/// the root is not a tab bar, or before iOS 17, which cannot select a tab.
|
|
85
|
+
private func selectTab(owning path: String) -> Bool {
|
|
86
|
+
guard #available(iOS 17.0, *),
|
|
87
|
+
let tabBar = interfaceController.rootTemplate as? CPTabBarTemplate,
|
|
88
|
+
let tab = tabBar.templates.first(where: { $0.contentPath == path })
|
|
89
|
+
else { return false }
|
|
90
|
+
let isPushed = interfaceController.templates.count > 1
|
|
91
|
+
if tabBar.selectedTemplate === tab, !isPushed { return true }
|
|
92
|
+
guard isPushed else {
|
|
93
|
+
tabBar.select(tab)
|
|
94
|
+
return true
|
|
95
|
+
}
|
|
96
|
+
interfaceController.safePopToRoot(animated: true) { popped, _ in
|
|
97
|
+
// After a failed pop the selection would land under the pushed stack.
|
|
98
|
+
guard popped else { return }
|
|
99
|
+
tabBar.select(tab)
|
|
100
|
+
}
|
|
101
|
+
return true
|
|
102
|
+
}
|
|
103
|
+
}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import CarPlay
|
|
2
|
+
import NitroModules
|
|
3
|
+
|
|
4
|
+
extension CarPlaySession {
|
|
5
|
+
/// Loads a content template's page when it first appears, the moment CarPlay applies updates
|
|
6
|
+
/// (an update made straight after a push is dropped).
|
|
7
|
+
func loadContentIfNeeded(for template: CPListTemplate) {
|
|
8
|
+
guard let path = template.contentPath, template.sections.isEmpty else { return }
|
|
9
|
+
spawn { await $0.loadContent(for: path, into: template) }
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
/// Resolves `path` into a loading template, showing a centered message when the page is
|
|
13
|
+
/// empty, fails, or outlasts `resolveTimeout`.
|
|
14
|
+
func loadContent(for path: String, into template: CPListTemplate) async {
|
|
15
|
+
let templateId = ObjectIdentifier(template)
|
|
16
|
+
guard !loadingTemplates.contains(templateId) else { return }
|
|
17
|
+
loadingTemplates.insert(templateId)
|
|
18
|
+
defer { loadingTemplates.remove(templateId) }
|
|
19
|
+
|
|
20
|
+
let timeout = resolveTimeout
|
|
21
|
+
let watchdog = Task { @MainActor [weak self] in
|
|
22
|
+
do { try await Task.sleep(for: timeout) } catch { return }
|
|
23
|
+
guard let self, template.sections.isEmpty else { return }
|
|
24
|
+
logger.error("loadContent: resolve timed out for \(path)")
|
|
25
|
+
await showNavigationError(
|
|
26
|
+
NavigationError(code: .timeout, message: "", statusCode: nil, statusCodeSuccess: nil), path: path, on: template,
|
|
27
|
+
)
|
|
28
|
+
}
|
|
29
|
+
let outcome: Result<ResolvedTrack, Error>
|
|
30
|
+
do {
|
|
31
|
+
outcome = try await .success(audioBrowser.browserManager.resolve(path, useCache: true))
|
|
32
|
+
} catch {
|
|
33
|
+
outcome = .failure(error)
|
|
34
|
+
}
|
|
35
|
+
// As soon as the resolve settles: formatting its error is a JS round trip the timeout must
|
|
36
|
+
// not overwrite.
|
|
37
|
+
watchdog.cancel()
|
|
38
|
+
|
|
39
|
+
switch outcome {
|
|
40
|
+
case let .success(resolved):
|
|
41
|
+
guard !Task.isCancelled else { return }
|
|
42
|
+
// An assistant cell is content in itself, even with no rows; a page of empty sections is
|
|
43
|
+
// empty (ADR 0001).
|
|
44
|
+
let hasChildren = resolved.normalizedSections?.contains { !$0.children.isEmpty } ?? false
|
|
45
|
+
if hasChildren || resolved.carPlaySiriListButton != nil {
|
|
46
|
+
updateTemplate(template, with: resolved)
|
|
47
|
+
} else {
|
|
48
|
+
await showNavigationError(.code(.emptyContent), path: path, on: template)
|
|
49
|
+
}
|
|
50
|
+
case let .failure(error):
|
|
51
|
+
logger.error("Failed to load content for \(path): \(error.localizedDescription)")
|
|
52
|
+
await showNavigationError(NavigationError.from(error), path: path, on: template)
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
func updateTemplate(_ template: CPListTemplate, with resolvedTrack: ResolvedTrack) {
|
|
57
|
+
template.updateSections(listItemFactory.createSections(from: resolvedTrack))
|
|
58
|
+
template.assistantCellConfiguration = resolvedTrack.carPlaySiriListButton.map { position in
|
|
59
|
+
CPAssistantCellConfiguration(
|
|
60
|
+
position: position == .top ? .top : .bottom, visibility: .always, assistantAction: .playMedia,
|
|
61
|
+
)
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/// Shows a navigation error, as the app's `formatNavigationError` formats it, as the
|
|
66
|
+
/// template's centered message (ADR 0001).
|
|
67
|
+
private func showNavigationError(_ error: NavigationError, path: String, on template: CPListTemplate) async {
|
|
68
|
+
let formatted = await audioBrowser.browserManager.formatted(error, path: path)
|
|
69
|
+
guard !Task.isCancelled else { return }
|
|
70
|
+
let title = formatted.title.isEmpty ? "Couldn't load" : formatted.title
|
|
71
|
+
if isTabRoot(template) {
|
|
72
|
+
// A tab root cannot be popped, so its message is set in place; it renders when the tab
|
|
73
|
+
// is selected.
|
|
74
|
+
if #available(iOS 18.4, *) {
|
|
75
|
+
template.showsSpinnerWhileEmpty = false
|
|
76
|
+
}
|
|
77
|
+
template.setMessage(title, subtitle: formatted.message)
|
|
78
|
+
template.updateSections([])
|
|
79
|
+
} else {
|
|
80
|
+
// A pushed template's empty view renders reliably only as its initial state, so it is
|
|
81
|
+
// replaced. The message has no path: backing out and re-tapping retries.
|
|
82
|
+
interfaceController.safeReplaceTop(
|
|
83
|
+
template, with: CPListTemplate.message(title, subtitle: formatted.message, listTitle: template.title), animated: false,
|
|
84
|
+
)
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
private func isTabRoot(_ template: CPTemplate) -> Bool {
|
|
89
|
+
(interfaceController.rootTemplate as? CPTabBarTemplate)?.templates.contains { $0 === template } ?? false
|
|
90
|
+
}
|
|
91
|
+
}
|