react-native-audio-browser 0.2.0-next.52 → 0.2.0-next.54
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/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +35 -49
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +16 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +26 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +15 -11
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +112 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/package.json +1 -1
|
@@ -1,57 +1,46 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
import NitroModules
|
|
3
3
|
|
|
4
|
-
///
|
|
5
|
-
///
|
|
6
|
-
///
|
|
4
|
+
/// Copied out of `NativeBrowserConfiguration` once per `configureBrowser`: the generated getters
|
|
5
|
+
/// convert from C++ on every read, and routes are read on every resolve. Matches Kotlin's
|
|
6
|
+
/// BrowserConfig.
|
|
7
7
|
struct BrowserConfig {
|
|
8
|
-
/// Base HTTP request configuration (applied to every request kind)
|
|
9
8
|
var request: TransformableRequestConfig?
|
|
10
9
|
|
|
11
|
-
///
|
|
12
|
-
/// layered request → browse → route)
|
|
10
|
+
/// Layered request → browse → route.
|
|
13
11
|
var browse: TransformableRequestConfig?
|
|
14
12
|
|
|
15
|
-
///
|
|
13
|
+
/// Resolved once per content generation.
|
|
16
14
|
var requestResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?
|
|
17
15
|
|
|
18
|
-
///
|
|
16
|
+
/// Resolved once per content generation.
|
|
19
17
|
var browseResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?
|
|
20
18
|
|
|
21
|
-
/// Media URL transformation configuration
|
|
22
19
|
var media: MediaRequestConfig?
|
|
23
20
|
|
|
24
|
-
/// Artwork URL transformation configuration
|
|
25
21
|
var artwork: ArtworkRequestConfig?
|
|
26
22
|
|
|
27
|
-
///
|
|
28
|
-
/// now-playing). A distinct kind from `artwork`; the now-playing path falls back to
|
|
29
|
-
/// `artwork` when this is nil.
|
|
23
|
+
/// Lock screen, CarPlay and Android Auto now playing; falls back to `artwork` when nil.
|
|
30
24
|
var nowPlayingArtwork: ArtworkRequestConfig?
|
|
31
25
|
|
|
32
|
-
///
|
|
33
|
-
/// Includes __tabs__, __search__, and __default__ special routes
|
|
26
|
+
/// Includes the `__tabs__`, `__search__` and `__default__` special routes.
|
|
34
27
|
var routes: [NativeRouteEntry]?
|
|
35
28
|
|
|
36
|
-
///
|
|
29
|
+
/// Plays only the selected track instead of expanding its siblings into the queue.
|
|
37
30
|
var singleTrack: Bool = false
|
|
38
31
|
|
|
39
32
|
// MARK: - CarPlay Options
|
|
40
33
|
|
|
41
|
-
///
|
|
42
|
-
/// empty state while content resolves; nil leaves them blank)
|
|
34
|
+
/// The empty state shown while CarPlay content resolves; nil leaves it blank.
|
|
43
35
|
var carPlayLoadingTitle: String?
|
|
44
36
|
|
|
45
|
-
///
|
|
46
|
-
///
|
|
47
|
-
/// the album line only becomes tappable when a destination exists.
|
|
37
|
+
/// The browse path for the Now Playing album line when the track has no `albumPath`. Called on
|
|
38
|
+
/// track change, not at tap, so the line is tappable only when a destination exists.
|
|
48
39
|
var resolveAlbumPath: ((_ track: Track) -> Promise<String?>)?
|
|
49
40
|
|
|
50
|
-
///
|
|
41
|
+
/// Replaces the default track load behaviour.
|
|
51
42
|
var handleTrackLoad: ((_ event: TrackLoadEvent) -> Promise<Promise<Void>>)?
|
|
52
43
|
|
|
53
|
-
/// Callback to customize navigation error display (for i18n)
|
|
54
|
-
/// Used by CarPlay and available via `useFormattedNavigationError()` for app UI.
|
|
55
44
|
var formatNavigationError: ((_ params: FormatNavigationErrorParams) -> Promise<FormattedNavigationError?>)?
|
|
56
45
|
|
|
57
46
|
init() {}
|
|
@@ -72,15 +61,11 @@ struct BrowserConfig {
|
|
|
72
61
|
formatNavigationError = config.formatNavigationError
|
|
73
62
|
}
|
|
74
63
|
|
|
75
|
-
/// A copy
|
|
76
|
-
///
|
|
77
|
-
///
|
|
78
|
-
/// safe to hold after its JS runtime is gone: callers take their
|
|
79
|
-
/// static/built-in fallback paths (a callback-only route degrades to its
|
|
80
|
-
/// no-content path). See `HybridAudioBrowser.dropStaleJSCallbacks` for why
|
|
81
|
-
/// invoking a stale callback is fatal.
|
|
64
|
+
/// A copy with every JS function dropped, nested ones included, keeping the static fields.
|
|
65
|
+
/// Safe to hold after its JS runtime is gone, where invoking a callback aborts the process
|
|
66
|
+
/// (see `HybridAudioBrowser.dropStaleJSCallbacks`); callers take their static fallbacks.
|
|
82
67
|
func strippingJSCallbacks() -> BrowserConfig {
|
|
83
|
-
// Built
|
|
68
|
+
// Built from empty: a field added later is dropped unless it is copied here.
|
|
84
69
|
var stripped = BrowserConfig()
|
|
85
70
|
stripped.request = request?.strippingJSCallbacks()
|
|
86
71
|
stripped.browse = browse?.strippingJSCallbacks()
|
|
@@ -100,8 +85,8 @@ extension NativeRouteEntry: RouteEntry {}
|
|
|
100
85
|
|
|
101
86
|
// MARK: - Deep JS-callback stripping
|
|
102
87
|
|
|
103
|
-
// The generated structs are get-only from Swift, so each strip rebuilds the
|
|
104
|
-
//
|
|
88
|
+
// The generated structs are get-only from Swift, so each strip rebuilds the value through the
|
|
89
|
+
// memberwise initializer with the function fields nil.
|
|
105
90
|
|
|
106
91
|
private extension TransformableRequestConfig {
|
|
107
92
|
func strippingJSCallbacks() -> TransformableRequestConfig {
|
|
@@ -2,11 +2,9 @@ import Foundation
|
|
|
2
2
|
import NitroModules
|
|
3
3
|
import os.log
|
|
4
4
|
|
|
5
|
-
/// The browser's state (path, content, tabs, config), its content and search caches, favorites
|
|
6
|
-
/// and events. Pages come from `PageResolver`; requests go through `RequestPipeline`.
|
|
7
5
|
@MainActor
|
|
8
6
|
final class BrowserManager {
|
|
9
|
-
//
|
|
7
|
+
// Nonisolated so HybridAudioBrowser can create it as a property default.
|
|
10
8
|
nonisolated init() {
|
|
11
9
|
pages = PageResolver(requests: requests)
|
|
12
10
|
}
|
|
@@ -18,16 +16,16 @@ final class BrowserManager {
|
|
|
18
16
|
let requests = RequestPipeline()
|
|
19
17
|
private let pages: PageResolver
|
|
20
18
|
|
|
21
|
-
//
|
|
19
|
+
// Entries are unhydrated; `resolve` hydrates favorites on the way out.
|
|
22
20
|
private let contentCache = LRUCache<String, ResolvedTrack>(maxSize: 20)
|
|
23
21
|
|
|
24
|
-
//
|
|
22
|
+
// Raw results, never hydrated ones: `FavoriteSet.hydrate` skips a track whose `favorited` is
|
|
23
|
+
// already set, so a hydrated slot would keep the favorites of the first search.
|
|
25
24
|
private var lastSearchKey: String?
|
|
26
25
|
private var lastSearchResults: [Track]?
|
|
27
26
|
|
|
28
27
|
private var favorites = FavoriteSet()
|
|
29
28
|
|
|
30
|
-
// Navigation tracking to prevent race conditions
|
|
31
29
|
private var currentNavigationId: Int = 0
|
|
32
30
|
|
|
33
31
|
// MARK: - Public State
|
|
@@ -42,17 +40,15 @@ final class BrowserManager {
|
|
|
42
40
|
|
|
43
41
|
private(set) var content: ResolvedTrack? {
|
|
44
42
|
didSet {
|
|
45
|
-
//
|
|
43
|
+
// ResolvedTrack is not comparable, so every set emits.
|
|
46
44
|
contentChanged.emit(content)
|
|
47
45
|
}
|
|
48
46
|
}
|
|
49
47
|
|
|
50
48
|
private(set) var tabs: [Track]? {
|
|
51
49
|
didSet {
|
|
52
|
-
//
|
|
53
|
-
//
|
|
54
|
-
// titles in a new locale), and an unchanged result must not churn the
|
|
55
|
-
// CarPlay tab bar or reset its selection.
|
|
50
|
+
// An unchanged result must not churn the CarPlay tab bar or reset its selection;
|
|
51
|
+
// `invalidateAll` re-queries the tabs every time.
|
|
56
52
|
if let tabs, !TabBarEntries.same(oldValue, tabs) {
|
|
57
53
|
tabsChanged.emit(tabs)
|
|
58
54
|
}
|
|
@@ -61,11 +57,8 @@ final class BrowserManager {
|
|
|
61
57
|
|
|
62
58
|
// MARK: - Configuration
|
|
63
59
|
|
|
64
|
-
/// Whether configureBrowser() has been called
|
|
65
60
|
private(set) var isConfigured = false
|
|
66
61
|
|
|
67
|
-
/// Browser configuration containing routes, search, tabs, and request settings. Kept on
|
|
68
|
-
/// `requests`, which every request reads.
|
|
69
62
|
var config: BrowserConfig {
|
|
70
63
|
get { requests.config }
|
|
71
64
|
set {
|
|
@@ -81,13 +74,12 @@ final class BrowserManager {
|
|
|
81
74
|
let contentChanged = Emitter<ResolvedTrack?>()
|
|
82
75
|
let tabsChanged = Emitter<[Track]>()
|
|
83
76
|
let configChanged = Emitter<BrowserConfig>()
|
|
84
|
-
///
|
|
85
|
-
/// surfaces like the CarPlay now-playing heart can re-render.
|
|
77
|
+
/// Emitted on any change to the favorites, however it came about.
|
|
86
78
|
let favoritesChanged = Emitter<Void>()
|
|
87
79
|
|
|
88
|
-
/// Runs the app's `handleTrackLoad`
|
|
89
|
-
///
|
|
90
|
-
/// set
|
|
80
|
+
/// Runs the app's `handleTrackLoad` and awaits both promise layers (a JS callback returning
|
|
81
|
+
/// `Promise<void>` arrives as `Promise<Promise<Void>>`); a failure is logged, not thrown. False
|
|
82
|
+
/// when the app set no handler.
|
|
91
83
|
func awaitTrackLoadHandler(event: TrackLoadEvent) async -> Bool {
|
|
92
84
|
guard let handler = config.handleTrackLoad else { return false }
|
|
93
85
|
do {
|
|
@@ -100,41 +92,35 @@ final class BrowserManager {
|
|
|
100
92
|
|
|
101
93
|
// MARK: - Favorites
|
|
102
94
|
|
|
103
|
-
/// Sets the favorited track identities, emitting `favoritesChanged` when they change.
|
|
104
95
|
func setFavorites(_ favorites: [String]) {
|
|
105
96
|
if self.favorites.replace(with: favorites) {
|
|
106
97
|
favoritesChanged.emit(())
|
|
107
98
|
}
|
|
108
99
|
}
|
|
109
100
|
|
|
110
|
-
/// Enables/disables favoriting (propagated from the `favorite` capability).
|
|
111
101
|
func setFavoriteEnabled(_ enabled: Bool) {
|
|
112
102
|
favorites.enabled = enabled
|
|
113
103
|
}
|
|
114
104
|
|
|
115
|
-
/// Optimistically reflects a local favorite toggle (`FavoriteSet.set`), so the now-playing
|
|
116
|
-
/// heart stays responsive.
|
|
117
105
|
func setFavorited(identity: String, favorited: Bool) {
|
|
118
106
|
favorites.set(identity, favorited: favorited)
|
|
119
107
|
}
|
|
120
108
|
|
|
121
|
-
/// `track` with its `favorited` hydrated (`FavoriteSet.hydrate`).
|
|
122
109
|
func hydrateFavorite(_ track: Track) -> Track {
|
|
123
110
|
favorites.hydrate(track)
|
|
124
111
|
}
|
|
125
112
|
|
|
126
113
|
// MARK: - Navigation
|
|
127
114
|
|
|
128
|
-
/// Loads `path` as the current page. `bypassCache`
|
|
129
|
-
///
|
|
130
|
-
///
|
|
131
|
-
/// fast /b succeeded would otherwise show /a's error over /b's content.
|
|
115
|
+
/// Loads `path` as the current page. `bypassCache` refetches it and keeps the current content
|
|
116
|
+
/// on screen meanwhile. A newer load supersedes this one: its result or error is dropped, so a
|
|
117
|
+
/// slow failing /a cannot show its error over a fast /b's content.
|
|
132
118
|
func load(_ path: String, bypassCache: Bool = false) async throws {
|
|
133
119
|
currentNavigationId += 1
|
|
134
120
|
let navigationId = currentNavigationId
|
|
135
121
|
self.path = path
|
|
136
122
|
if bypassCache {
|
|
137
|
-
//
|
|
123
|
+
// So a failed reload doesn't leave the stale page in the cache.
|
|
138
124
|
contentCache.remove(path)
|
|
139
125
|
} else {
|
|
140
126
|
content = nil
|
|
@@ -149,31 +135,22 @@ final class BrowserManager {
|
|
|
149
135
|
}
|
|
150
136
|
}
|
|
151
137
|
|
|
152
|
-
///
|
|
138
|
+
/// Contextual paths resolve their parent page. Favorites are hydrated on every call.
|
|
153
139
|
func resolve(_ path: String, useCache: Bool = true) async throws -> ResolvedTrack {
|
|
154
|
-
// Strip __trackId from contextual URLs
|
|
155
140
|
let normalizedPath = BrowserPathHelper.stripTrackId(path)
|
|
156
141
|
|
|
157
|
-
// Check content cache first
|
|
158
142
|
if useCache, let cached = contentCache.get(normalizedPath) {
|
|
159
143
|
return favorites.hydrate(cached)
|
|
160
144
|
}
|
|
161
145
|
|
|
162
146
|
let resolvedTrack = try await pages.resolve(normalizedPath)
|
|
163
147
|
|
|
164
|
-
// Cache the resolved content for future navigation
|
|
165
148
|
contentCache.set(normalizedPath, value: resolvedTrack)
|
|
166
149
|
|
|
167
150
|
return favorites.hydrate(resolvedTrack)
|
|
168
151
|
}
|
|
169
152
|
|
|
170
|
-
///
|
|
171
|
-
///
|
|
172
|
-
/// Expects a *container* path. A contextual path (`…?__trackId=…`) addresses
|
|
173
|
-
/// a child, not a cache entry — entries are keyed by the stripped parent — so
|
|
174
|
-
/// passing one used to remove nothing at all, silently. Android `require`s the
|
|
175
|
-
/// same precondition; this throws so the misuse surfaces identically on both
|
|
176
|
-
/// platforms instead of no-opping on one.
|
|
153
|
+
/// Throws on a contextual path, which never names a cache entry (Android requires the same).
|
|
177
154
|
func invalidateContentCache(_ path: String) throws {
|
|
178
155
|
guard !BrowserPathHelper.isContextual(path) else {
|
|
179
156
|
throw BrowserError.invalidConfiguration(
|
|
@@ -183,10 +160,9 @@ final class BrowserManager {
|
|
|
183
160
|
contentCache.remove(path)
|
|
184
161
|
}
|
|
185
162
|
|
|
186
|
-
/// Clears
|
|
187
|
-
///
|
|
188
|
-
///
|
|
189
|
-
/// waits for nor cancels the tabs, and a failed tabs re-query keeps the current tabs.
|
|
163
|
+
/// Clears every cache and the resolved request layers, then re-queries the tabs and reloads
|
|
164
|
+
/// the current path, independently: a failed reload goes to `reloadFailed` with its path, and
|
|
165
|
+
/// a failed tabs query keeps the current tabs.
|
|
190
166
|
func invalidateAll(reloadFailed: @escaping @MainActor (Error, String) async -> Void) {
|
|
191
167
|
contentCache.clear()
|
|
192
168
|
requests.invalidateLayers()
|
|
@@ -202,8 +178,7 @@ final class BrowserManager {
|
|
|
202
178
|
}
|
|
203
179
|
}
|
|
204
180
|
|
|
205
|
-
///
|
|
206
|
-
/// there is no formatter or it fails.
|
|
181
|
+
/// The app's `formatNavigationError` result, or the default when it has none or it fails.
|
|
207
182
|
func formatted(_ error: NavigationError, path: String) async -> FormattedNavigationError {
|
|
208
183
|
let fallback = error.defaultFormatted()
|
|
209
184
|
guard let formatter = config.formatNavigationError else { return fallback }
|
|
@@ -215,51 +190,34 @@ final class BrowserManager {
|
|
|
215
190
|
|
|
216
191
|
// MARK: - Search
|
|
217
192
|
|
|
218
|
-
/// Execute a search query.
|
|
219
|
-
/// Plain free-text search — wraps the structured overload with no mode/filters.
|
|
220
193
|
func search(_ query: String) async throws -> ResolvedTrack {
|
|
221
194
|
try await search(
|
|
222
195
|
SearchParams(mode: nil, query: query, genre: nil, artist: nil, album: nil, title: nil, playlist: nil, reference: .unknown),
|
|
223
196
|
)
|
|
224
197
|
}
|
|
225
198
|
|
|
226
|
-
///
|
|
227
|
-
///
|
|
228
|
-
/// Voice intents reuse `query` across different structures —
|
|
229
|
-
/// `MediaIntentCriteria` falls back to the structured value when there is no
|
|
230
|
-
/// spoken name, so "play jazz" (genre) and a text search for "jazz" arrive
|
|
231
|
-
/// with an identical `query` — hence `cacheKey` rather than `query`.
|
|
199
|
+
/// Cached by `cacheKey`, not `query`: voice intents fill `query` from a genre or artist when
|
|
200
|
+
/// nothing was spoken, so "play jazz" and a text search for "jazz" share a `query`.
|
|
232
201
|
func search(_ params: SearchParams) async throws -> ResolvedTrack {
|
|
233
202
|
let query = params.query
|
|
234
203
|
let cacheKey = params.cacheKey
|
|
235
204
|
|
|
236
|
-
// Check cache - hydrate favorites on the way out, since they may have
|
|
237
|
-
// changed since the search ran (the slot holds the raw results for exactly
|
|
238
|
-
// this reason — see below).
|
|
239
205
|
if cacheKey == lastSearchKey, let results = lastSearchResults {
|
|
240
206
|
return makeSearchResult(query: query, results: results)
|
|
241
207
|
}
|
|
242
208
|
|
|
243
209
|
let results = try await pages.search(params)
|
|
244
210
|
|
|
245
|
-
// Cache the RAW results, never the hydrated ones: hydration is one-shot
|
|
246
|
-
// (`FavoriteSet.hydrate` skips a track whose `favorited` is already set), so a
|
|
247
|
-
// hydrated slot would serve the favorites as they were at first search
|
|
248
|
-
// forever. The content cache keys on the same rule — it stores the
|
|
249
|
-
// unhydrated resolve and hydrates in `resolve()`.
|
|
250
211
|
lastSearchKey = cacheKey
|
|
251
212
|
lastSearchResults = results
|
|
252
213
|
|
|
253
214
|
return makeSearchResult(query: query, results: results)
|
|
254
215
|
}
|
|
255
216
|
|
|
256
|
-
///
|
|
257
|
-
///
|
|
258
|
-
/// station. Decision in `SearchDrillIn.playable`; mirrors Android's
|
|
259
|
-
/// `searchPlayable`.
|
|
217
|
+
/// Playable tracks for a "play X" voice intent, drilling into a browsable-only first result
|
|
218
|
+
/// (`SearchDrillIn.playable`). Mirrors Android's `searchPlayable`.
|
|
260
219
|
func searchPlayable(_ params: SearchParams) async throws -> [Track]? {
|
|
261
|
-
//
|
|
262
|
-
// before drill-in so an unavailable first result can't capture the play.
|
|
220
|
+
// Disabled tracks go before drill-in, so an unavailable first result can't take the play.
|
|
263
221
|
let children = try await ((search(params).flattenedChildren) ?? [])
|
|
264
222
|
.filter { $0.disabled != true }
|
|
265
223
|
return try await SearchDrillIn.playable(from: children) { [self] path in
|
|
@@ -268,12 +226,8 @@ final class BrowserManager {
|
|
|
268
226
|
}
|
|
269
227
|
}
|
|
270
228
|
|
|
271
|
-
/// Wraps raw search results as a resolved page, hydrating favorites on the
|
|
272
|
-
/// way out — the single exit for `search`, so an unhydrated search page can't
|
|
273
|
-
/// be emitted (the same funnel `resolve()` has).
|
|
274
229
|
private func makeSearchResult(query: String, results: [Track]) -> ResolvedTrack {
|
|
275
|
-
// Search results
|
|
276
|
-
// untitled section (ADR 0010).
|
|
230
|
+
// Search results become one untitled section (ADR 0010).
|
|
277
231
|
ResolvedTrack(
|
|
278
232
|
path: BrowserPathHelper.createSearchPath(query),
|
|
279
233
|
style: nil,
|
|
@@ -301,7 +255,6 @@ final class BrowserManager {
|
|
|
301
255
|
|
|
302
256
|
// MARK: - Tabs
|
|
303
257
|
|
|
304
|
-
/// Query navigation tabs.
|
|
305
258
|
func queryTabs() async throws -> [Track] {
|
|
306
259
|
guard let tabs = try await pages.tabs() else { return [] }
|
|
307
260
|
self.tabs = tabs
|
|
@@ -310,7 +263,8 @@ final class BrowserManager {
|
|
|
310
263
|
|
|
311
264
|
// MARK: - Queue Expansion (for CarPlay/external controllers)
|
|
312
265
|
|
|
313
|
-
/// The queue a tap on the contextual `path` plays (`SectionScope.queue`)
|
|
266
|
+
/// The queue a tap on the contextual `path` plays (`SectionScope.queue`); nil when `path` is
|
|
267
|
+
/// not contextual.
|
|
314
268
|
func expandQueueFromContextualPath(_ path: String) async throws -> (tracks: [Track], selectedIndex: Int)? {
|
|
315
269
|
guard BrowserPathHelper.extractTrackId(path) != nil else { return nil }
|
|
316
270
|
let resolved = try await resolve(BrowserPathHelper.stripTrackId(path), useCache: true)
|
|
@@ -3,71 +3,39 @@ import Foundation
|
|
|
3
3
|
import NitroModules
|
|
4
4
|
#endif
|
|
5
5
|
|
|
6
|
-
///
|
|
7
|
-
///
|
|
8
|
-
///
|
|
9
|
-
///
|
|
10
|
-
/// 2. Contextual URLs: Embed parent context in track identifiers for playback integration
|
|
11
|
-
///
|
|
12
|
-
/// Contextual URL format: `{parentPath}?__trackId={trackIdentity}&__index={childIndex}`
|
|
13
|
-
/// Example: "/library/radio?__trackId=song.mp3&__index=2"
|
|
14
|
-
///
|
|
15
|
-
/// `__trackId` is the identity check; `__index` (the child's position on the
|
|
16
|
-
/// page at stamp time) is only a tie-breaker between surfaces that carry the
|
|
17
|
-
/// same identity — a stale index never selects a different track.
|
|
18
|
-
///
|
|
19
|
-
/// This allows:
|
|
20
|
-
/// - Playable-only tracks (tracks with `src` but no `path`) to be referenced
|
|
21
|
-
/// - Cache lookup to work consistently
|
|
22
|
-
/// - Parent context to be preserved for queue restoration
|
|
6
|
+
/// Search paths (`/__search?q=…`) and contextual paths, which address a child of a page:
|
|
7
|
+
/// `{parentPath}?__trackId={identity}&__index={position}`. `__trackId` decides the track;
|
|
8
|
+
/// `__index` only breaks ties between children with the same identity, so a stale index never
|
|
9
|
+
/// selects a different track.
|
|
23
10
|
enum BrowserPathHelper {
|
|
24
|
-
/// Search path prefix (full path is /__search?q=query)
|
|
25
11
|
static let searchPathPrefix = "/__search"
|
|
26
12
|
|
|
27
|
-
/// Character set for percent-encoding query parameter keys and values.
|
|
28
|
-
/// Starts from `.urlQueryAllowed` but removes characters that have special
|
|
29
|
-
/// meaning in query strings (`&`, `=`, `+`) to prevent value corruption.
|
|
30
13
|
private static let queryComponentAllowed: CharacterSet = {
|
|
31
14
|
var cs = CharacterSet.urlQueryAllowed
|
|
32
15
|
cs.remove(charactersIn: "&=+")
|
|
33
16
|
return cs
|
|
34
17
|
}()
|
|
35
18
|
|
|
36
|
-
/// Query parameter name for contextual track identifiers
|
|
37
19
|
private static let contextualTrackParam = "__trackId"
|
|
38
20
|
|
|
39
|
-
/// Query parameter name for the tapped child's page position (tie-breaker)
|
|
40
21
|
private static let contextualIndexParam = "__index"
|
|
41
22
|
|
|
42
|
-
/// Check if a path is a search path (`/__search?q=…`)
|
|
43
23
|
static func isSearchPath(_ path: String) -> Bool {
|
|
44
24
|
path.hasPrefix("\(searchPathPrefix)?")
|
|
45
25
|
}
|
|
46
26
|
|
|
47
|
-
/// Create a search path for a given query
|
|
48
27
|
static func createSearchPath(_ query: String) -> String {
|
|
49
28
|
let encodedQuery =
|
|
50
29
|
query.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? query
|
|
51
30
|
return "\(searchPathPrefix)?q=\(encodedQuery)"
|
|
52
31
|
}
|
|
53
32
|
|
|
54
|
-
/// Checks if a path contains a contextual track identifier.
|
|
55
|
-
///
|
|
56
|
-
/// - Parameter path: The URL path to check
|
|
57
|
-
/// - Returns: true if the path contains the contextual track parameter
|
|
58
33
|
static func isContextual(_ path: String) -> Bool {
|
|
59
34
|
path.contains("?\(contextualTrackParam)=")
|
|
60
35
|
|| path.contains("&\(contextualTrackParam)=")
|
|
61
36
|
}
|
|
62
37
|
|
|
63
|
-
/// Strips
|
|
64
|
-
/// URL to get the parent path. If the URL is not contextual, returns it unchanged.
|
|
65
|
-
///
|
|
66
|
-
/// - Parameter url: The URL to process
|
|
67
|
-
/// - Returns: The URL without the contextual parameters
|
|
68
|
-
///
|
|
69
|
-
/// Example: "/library/radio?__trackId=song.mp3&__index=2" → "/library/radio"
|
|
70
|
-
/// Example: "/search?q=jazz&__trackId=song.mp3" → "/search?q=jazz"
|
|
38
|
+
/// Strips both `__trackId` and `__index`; `url` unchanged when it is not contextual.
|
|
71
39
|
static func stripTrackId(_ url: String) -> String {
|
|
72
40
|
guard isContextual(url) else {
|
|
73
41
|
return url
|
|
@@ -77,12 +45,10 @@ enum BrowserPathHelper {
|
|
|
77
45
|
return url
|
|
78
46
|
}
|
|
79
47
|
|
|
80
|
-
// Filter out the contextual parameters
|
|
81
48
|
components.queryItems = components.queryItems?.filter {
|
|
82
49
|
$0.name != contextualTrackParam && $0.name != contextualIndexParam
|
|
83
50
|
}
|
|
84
51
|
|
|
85
|
-
// If no query items left, clear the query string entirely
|
|
86
52
|
if components.queryItems?.isEmpty == true {
|
|
87
53
|
components.queryItems = nil
|
|
88
54
|
}
|
|
@@ -90,18 +56,8 @@ enum BrowserPathHelper {
|
|
|
90
56
|
return components.string ?? url
|
|
91
57
|
}
|
|
92
58
|
|
|
93
|
-
///
|
|
94
|
-
///
|
|
95
|
-
/// Handles existing query parameters correctly.
|
|
96
|
-
///
|
|
97
|
-
/// - Parameters:
|
|
98
|
-
/// - parentPath: The parent container path
|
|
99
|
-
/// - trackId: The track identity (`id` when non-blank, else `src`)
|
|
100
|
-
/// - index: The child's position on the page at stamp time (tie-breaker)
|
|
101
|
-
/// - Returns: A contextual URL combining parent path, track ID, and index
|
|
102
|
-
///
|
|
103
|
-
/// Example: build("/library", "song.mp3", index: 2) → "/library?__trackId=song.mp3&__index=2"
|
|
104
|
-
/// Example: build("/search?q=jazz", "song.mp3") → "/search?q=jazz&__trackId=song.mp3"
|
|
59
|
+
/// `parentPath` with `trackId` (the track's identity) and, when given, its page position
|
|
60
|
+
/// appended; keeps any query `parentPath` already has.
|
|
105
61
|
static func build(parentPath: String, trackId: String, index: Int? = nil) -> String {
|
|
106
62
|
let encodedTrackId =
|
|
107
63
|
trackId.addingPercentEncoding(withAllowedCharacters: queryComponentAllowed) ?? trackId
|
|
@@ -110,13 +66,6 @@ enum BrowserPathHelper {
|
|
|
110
66
|
return "\(parentPath)\(separator)\(contextualTrackParam)=\(encodedTrackId)\(indexParam)"
|
|
111
67
|
}
|
|
112
68
|
|
|
113
|
-
/// Extracts the track ID from a contextual URL.
|
|
114
|
-
/// Returns nil if the URL is not contextual or doesn't contain the track ID parameter.
|
|
115
|
-
///
|
|
116
|
-
/// - Parameter path: The contextual URL to parse
|
|
117
|
-
/// - Returns: The extracted track ID, or nil if not found
|
|
118
|
-
///
|
|
119
|
-
/// Example: "/library/radio?__trackId=song.mp3" → "song.mp3"
|
|
120
69
|
static func extractTrackId(_ path: String) -> String? {
|
|
121
70
|
guard isContextual(path) else {
|
|
122
71
|
return nil
|
|
@@ -129,10 +78,7 @@ enum BrowserPathHelper {
|
|
|
129
78
|
return components.queryItems?.first { $0.name == contextualTrackParam }?.value
|
|
130
79
|
}
|
|
131
80
|
|
|
132
|
-
///
|
|
133
|
-
/// URL is not contextual or carries no (valid, non-negative) index.
|
|
134
|
-
///
|
|
135
|
-
/// Example: "/library/radio?__trackId=song.mp3&__index=2" → 2
|
|
81
|
+
/// Nil when the path is not contextual or its index is missing or negative.
|
|
136
82
|
static func extractIndex(_ path: String) -> Int? {
|
|
137
83
|
guard isContextual(path),
|
|
138
84
|
let components = URLComponents(string: path),
|
|
@@ -144,16 +90,7 @@ enum BrowserPathHelper {
|
|
|
144
90
|
return index
|
|
145
91
|
}
|
|
146
92
|
|
|
147
|
-
///
|
|
148
|
-
///
|
|
149
|
-
/// - Parameters:
|
|
150
|
-
/// - query: Dictionary of query parameter key-value pairs
|
|
151
|
-
/// - url: The URL to append parameters to
|
|
152
|
-
/// - Returns: The URL with query parameters appended
|
|
153
|
-
///
|
|
154
|
-
/// Examples:
|
|
155
|
-
/// - appendQuery(["q": "jazz"], to: "/search") → "/search?q=jazz"
|
|
156
|
-
/// - appendQuery(["page": "2"], to: "/items?sort=new") → "/items?sort=new&page=2"
|
|
93
|
+
/// Percent-encodes keys and values, so pass them unencoded.
|
|
157
94
|
static func appendQuery(_ query: [String: String], to url: String) -> String {
|
|
158
95
|
guard !query.isEmpty else { return url }
|
|
159
96
|
|
|
@@ -169,31 +106,17 @@ enum BrowserPathHelper {
|
|
|
169
106
|
return "\(url)\(separator)\(queryString)"
|
|
170
107
|
}
|
|
171
108
|
|
|
172
|
-
///
|
|
173
|
-
///
|
|
174
|
-
/// - Parameters:
|
|
175
|
-
/// - baseUrl: The base URL (can be nil)
|
|
176
|
-
/// - path: The path to append
|
|
177
|
-
/// - Returns: The combined URL with proper slash handling
|
|
178
|
-
///
|
|
179
|
-
/// Examples:
|
|
180
|
-
/// - buildUrl("http://example.com", "api/test") → "http://example.com/api/test"
|
|
181
|
-
/// - buildUrl("http://example.com/", "/api/test") → "http://example.com/api/test"
|
|
182
|
-
/// - buildUrl(nil, "/api/test") → "/api/test"
|
|
183
|
-
/// - buildUrl(nil, "http://full.url") → "http://full.url"
|
|
109
|
+
/// `path` joined to `baseUrl` with one slash; `path` alone when it is a full http(s) URL or
|
|
110
|
+
/// there is no base, and the base alone when `path` is empty or only slashes.
|
|
184
111
|
static func buildUrl(baseUrl: String?, path: String) -> String {
|
|
185
|
-
// If path is already a full URL, return it as-is
|
|
186
112
|
if path.hasPrefix("http://") || path.hasPrefix("https://") {
|
|
187
113
|
return path
|
|
188
114
|
}
|
|
189
115
|
|
|
190
|
-
// If no baseUrl, return path as-is
|
|
191
116
|
guard let baseUrl else {
|
|
192
117
|
return path
|
|
193
118
|
}
|
|
194
119
|
|
|
195
|
-
// Strip trailing slashes from the base and leading slashes from the path so
|
|
196
|
-
// they join with exactly one separator.
|
|
197
120
|
var normalizedBase = baseUrl
|
|
198
121
|
while normalizedBase.hasSuffix("/") {
|
|
199
122
|
normalizedBase.removeLast()
|
|
@@ -204,8 +127,6 @@ enum BrowserPathHelper {
|
|
|
204
127
|
normalizedPath.removeFirst()
|
|
205
128
|
}
|
|
206
129
|
|
|
207
|
-
// Empty path → the base IS the full URL (e.g. a search endpoint whose
|
|
208
|
-
// baseUrl already includes the path); don't leave a dangling trailing slash.
|
|
209
130
|
if normalizedPath.isEmpty {
|
|
210
131
|
return normalizedBase
|
|
211
132
|
}
|
|
@@ -215,9 +136,8 @@ enum BrowserPathHelper {
|
|
|
215
136
|
}
|
|
216
137
|
|
|
217
138
|
extension BrowserPathHelper {
|
|
218
|
-
/// `sections` with a contextual path on every
|
|
219
|
-
///
|
|
220
|
-
/// concatenated in section order). Throws when a track has neither `path` nor `src`.
|
|
139
|
+
/// `sections` with a contextual path on every track that has a `src` and no `path`, its index
|
|
140
|
+
/// counted across all sections. Throws on a track with neither.
|
|
221
141
|
static func stampingContextualPaths(_ sections: [Section], parentPath: String) throws -> [Section] {
|
|
222
142
|
var flatIndex = 0
|
|
223
143
|
return try sections.map { section in
|
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
import NitroModules
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
|
-
/// The favorited track identities
|
|
6
|
-
///
|
|
5
|
+
/// The favorited track identities and whether favoriting is on (the player's `favorite`
|
|
6
|
+
/// capability).
|
|
7
7
|
struct FavoriteSet {
|
|
8
8
|
private var identities: Set<String> = []
|
|
9
|
-
/// Off, tracks are left as they are: no row hearts.
|
|
10
9
|
var enabled = false
|
|
11
10
|
|
|
12
|
-
///
|
|
11
|
+
/// False when `favorites` holds the identities already there.
|
|
13
12
|
mutating func replace(with favorites: [String]) -> Bool {
|
|
14
13
|
let replaced = Set(favorites)
|
|
15
14
|
guard replaced != identities else { return false }
|
|
@@ -17,8 +16,7 @@ struct FavoriteSet {
|
|
|
17
16
|
return true
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
///
|
|
21
|
-
/// reconciles the set to its canonical one.
|
|
19
|
+
/// A local toggle; the consumer's next `replace(with:)` overrides it.
|
|
22
20
|
mutating func set(_ identity: String, favorited: Bool) {
|
|
23
21
|
if favorited {
|
|
24
22
|
identities.insert(identity)
|
|
@@ -27,16 +25,15 @@ struct FavoriteSet {
|
|
|
27
25
|
}
|
|
28
26
|
}
|
|
29
27
|
|
|
30
|
-
/// `track` with `favorited`
|
|
31
|
-
///
|
|
32
|
-
///
|
|
28
|
+
/// `track` with `favorited` true or false, so an unfavorited track shows an empty heart.
|
|
29
|
+
/// Unchanged when favoriting is off, the track has no identity, or it already carries
|
|
30
|
+
/// `favorited`: a value from the API or the consumer wins, as on Android and web.
|
|
33
31
|
func hydrate(_ track: Track) -> Track {
|
|
34
32
|
// `identity` bridges a std::string out of the C++ track, so it is read once.
|
|
35
33
|
guard enabled, track.favorited == nil, let identity = track.identity else { return track }
|
|
36
34
|
return track.copying(favorited: identities.contains(identity))
|
|
37
35
|
}
|
|
38
36
|
|
|
39
|
-
/// Every track of a normalized page (ADR 0010) hydrated.
|
|
40
37
|
func hydrate(_ page: ResolvedTrack) -> ResolvedTrack {
|
|
41
38
|
guard let sections = page.sections else { return page }
|
|
42
39
|
return page.copying(sections: sections.map { section in
|