react-native-audio-browser 0.2.0-next.53 → 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 +28 -48
- 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 +2 -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 +5 -1
- 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 +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -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
|
@@ -4,35 +4,12 @@ import os.log
|
|
|
4
4
|
import NitroModules
|
|
5
5
|
#endif
|
|
6
6
|
|
|
7
|
-
///
|
|
8
|
-
///
|
|
9
|
-
///
|
|
10
|
-
///
|
|
11
|
-
/// errors — combinations are not invalid, they are *inert*, the way
|
|
12
|
-
/// `grid-template` on a non-grid element is inert in CSS. This is the
|
|
13
|
-
/// recovery: at page resolution every declaration its own block makes
|
|
14
|
-
/// unreadable is reported once, with the effective context and the fix.
|
|
15
|
-
///
|
|
16
|
-
/// The line it draws, and never crosses: only **structural** inertness — a
|
|
17
|
-
/// declaration the resolved block itself renders unreadable, on every surface
|
|
18
|
-
/// (`gridWrap` outside a grid, `cardTint` with no card treatment in scope).
|
|
19
|
-
/// *Surface* inertness is never reported, because declarations are
|
|
20
|
-
/// aspirational: `imageShape` on Android Auto, or a card treatment on a
|
|
21
|
-
/// pre-26 CarPlay, is intended usage — the renderer drops what it can't draw.
|
|
22
|
-
///
|
|
23
|
-
/// Runs where every page passes regardless of its source (static config,
|
|
24
|
-
/// route callback, or fetched browse JSON), and only on a cache miss, so a
|
|
25
|
-
/// mistake is reported once per resolution rather than once per serve.
|
|
26
|
-
///
|
|
27
|
-
/// Debug builds only: `warn` is the whole seam, so a release build never even
|
|
28
|
-
/// walks the page (the trade is that a page served only to a Release build —
|
|
29
|
-
/// TestFlight, production browse JSON — reports nothing; reproduce it against
|
|
30
|
-
/// a debug build).
|
|
7
|
+
/// Debug-build warnings for style declarations a resolved page can never render (ADR 0011).
|
|
8
|
+
/// Only structural inertness is reported: a declaration its own resolved block makes
|
|
9
|
+
/// unreadable on every surface. A declaration one surface can't draw (`imageShape` on
|
|
10
|
+
/// Android Auto, a card on older CarPlay) is intended usage and never reported.
|
|
31
11
|
enum InertStyleDiagnostic {
|
|
32
|
-
///
|
|
33
|
-
/// `#if` is here rather than at the call sites so callers read
|
|
34
|
-
/// unconditionally and the rule set stays free of build-configuration
|
|
35
|
-
/// knowledge.
|
|
12
|
+
/// Logs `findings` in debug builds; a release build does nothing, not even walk the page.
|
|
36
13
|
static func warn(path: String, pageStyle: SectionStyle?, sections: [Section]) {
|
|
37
14
|
#if DEBUG
|
|
38
15
|
let logger = Logger(subsystem: "com.audiobrowser", category: "InertStyleDiagnostic")
|
|
@@ -42,10 +19,9 @@ enum InertStyleDiagnostic {
|
|
|
42
19
|
#endif
|
|
43
20
|
}
|
|
44
21
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
/// `artworkRendering`, dispositioned below instead.
|
|
22
|
+
// Each style key of the spec is a case here or listed in `alwaysRenderable` / `positional`:
|
|
23
|
+
// src/style-resolution.test.ts parses these declarations, one `case` per line, and fails
|
|
24
|
+
// on a key missing from all three.
|
|
49
25
|
private enum Property: String, CaseIterable {
|
|
50
26
|
case gridWrap
|
|
51
27
|
case gridTile
|
|
@@ -54,9 +30,7 @@ enum InertStyleDiagnostic {
|
|
|
54
30
|
case cardTint
|
|
55
31
|
case cardImage
|
|
56
32
|
|
|
57
|
-
/// Item properties
|
|
58
|
-
/// be declared per track; container properties resolve by scope override
|
|
59
|
-
/// (`section ?? page`) and never reach an item.
|
|
33
|
+
/// Item properties may also be declared per track; container properties never reach one.
|
|
60
34
|
var isItemProperty: Bool {
|
|
61
35
|
switch self {
|
|
62
36
|
case .gridWrap, .gridTile: false
|
|
@@ -64,8 +38,6 @@ enum InertStyleDiagnostic {
|
|
|
64
38
|
}
|
|
65
39
|
}
|
|
66
40
|
|
|
67
|
-
/// Whether a value of this property, resolved into `context`, has any
|
|
68
|
-
/// rendering to affect. Each case is the spec's own "inert unless" clause.
|
|
69
41
|
func isInert(in context: Context) -> Bool {
|
|
70
42
|
switch self {
|
|
71
43
|
case .gridWrap, .gridTile: !context.isGrid
|
|
@@ -75,7 +47,6 @@ enum InertStyleDiagnostic {
|
|
|
75
47
|
}
|
|
76
48
|
}
|
|
77
49
|
|
|
78
|
-
/// The rule the declaration falls foul of, stated positively.
|
|
79
50
|
var rule: String {
|
|
80
51
|
switch self {
|
|
81
52
|
case .gridWrap, .gridTile: "`\(rawValue)` renders only in a grid"
|
|
@@ -99,38 +70,25 @@ enum InertStyleDiagnostic {
|
|
|
99
70
|
}
|
|
100
71
|
}
|
|
101
72
|
|
|
102
|
-
|
|
73
|
+
// `allCases` is computed; read it once rather than per section.
|
|
103
74
|
private static let allProperties = Property.allCases
|
|
104
75
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
/// in every layout), and `display` is positional — inert only in the one
|
|
108
|
-
/// position that opens no page (see `playableDisplayFinding`). Declared here
|
|
109
|
-
/// so the spec-level completeness test can hold this file to the whole
|
|
110
|
-
/// vocabulary: every key of the block is a rule, always renderable, or
|
|
111
|
-
/// positional, and a newly added property is a decision rather than an
|
|
112
|
-
/// omission.
|
|
76
|
+
// Keys with no structural inertness rule, read only by src/style-resolution.test.ts.
|
|
77
|
+
// `display` is inert only on a playable track, which `playableDisplayFinding` checks.
|
|
113
78
|
static let alwaysRenderable = ["artworkRendering"]
|
|
114
79
|
static let positional = ["display"]
|
|
115
80
|
|
|
116
|
-
/// A section's effective container context: the two container values every
|
|
117
|
-
/// inertness condition is stated against.
|
|
118
81
|
private struct Context {
|
|
119
82
|
let isGrid: Bool
|
|
120
83
|
let tile: GridTile
|
|
121
84
|
|
|
122
|
-
///
|
|
123
|
-
/// override: the diagnostic predicts what a renderer will do with these
|
|
124
|
-
/// declarations, so it has to resolve them the way the renderers do.
|
|
85
|
+
/// Folds through `StyleResolver` so the prediction matches what the renderers draw.
|
|
125
86
|
init(section: SectionStyle?, page: SectionStyle?) {
|
|
126
87
|
let folded = StyleResolver.sectionStyle(section: section, page: page)
|
|
127
88
|
isGrid = folded.display == .grid
|
|
128
89
|
tile = folded.gridTile ?? .plain
|
|
129
90
|
}
|
|
130
91
|
|
|
131
|
-
/// Whether the card treatment is what this container renders — the
|
|
132
|
-
/// condition the `card*` family is named after. Exhaustive, like
|
|
133
|
-
/// `isShaped`: a new tile kind has to be ruled on here.
|
|
134
92
|
var isCard: Bool {
|
|
135
93
|
guard isGrid else { return false }
|
|
136
94
|
return switch tile {
|
|
@@ -139,8 +97,6 @@ enum InertStyleDiagnostic {
|
|
|
139
97
|
}
|
|
140
98
|
}
|
|
141
99
|
|
|
142
|
-
/// Whether this container renders a tile family with a shape and an
|
|
143
|
-
/// accessory slot.
|
|
144
100
|
var isShaped: Bool {
|
|
145
101
|
guard isGrid else { return false }
|
|
146
102
|
return switch tile {
|
|
@@ -149,28 +105,16 @@ enum InertStyleDiagnostic {
|
|
|
149
105
|
}
|
|
150
106
|
}
|
|
151
107
|
|
|
152
|
-
/// The effective style, for the message — in the wire spelling the author
|
|
153
|
-
/// types (`stringValue` is the generated enum's own mapping). `gridTile`
|
|
154
|
-
/// is quoted only where a grid gives it meaning: naming it on a list would
|
|
155
|
-
/// be advice to fix the wrong property.
|
|
156
108
|
var described: String {
|
|
157
109
|
isGrid ? "display 'grid', gridTile '\(tile.stringValue)'" : "display 'list'"
|
|
158
110
|
}
|
|
159
111
|
}
|
|
160
112
|
|
|
161
|
-
/// Every inert declaration on a resolved page, as ready-to-log messages
|
|
162
|
-
///
|
|
163
|
-
///
|
|
164
|
-
/// - Parameters:
|
|
165
|
-
/// - path: the resolved path, named in every message.
|
|
166
|
-
/// - pageStyle: the page's own block (`ResolvedTrack.style`).
|
|
167
|
-
/// - sections: the page's normalized sections, blocks *unfolded* — the
|
|
168
|
-
/// diagnostic attributes each finding to the level that declared it, so
|
|
169
|
-
/// it must see the levels before `StyleResolver` merges them.
|
|
113
|
+
/// Every inert declaration on a resolved page, as ready-to-log messages.
|
|
114
|
+
/// `sections` carry their own blocks unfolded: each finding names the level that declared it.
|
|
170
115
|
static func findings(path: String, pageStyle: SectionStyle?, sections: [Section]) -> [String] {
|
|
171
116
|
var findings: [String] = []
|
|
172
|
-
// A page-level declaration is
|
|
173
|
-
// it renders in any section it reaches, however many others ignore it.
|
|
117
|
+
// A page-level declaration is reported only if no section it reaches renders it.
|
|
174
118
|
var pageReached: Set<Property> = []
|
|
175
119
|
var pageRendered: Set<Property> = []
|
|
176
120
|
|
|
@@ -190,7 +134,6 @@ enum InertStyleDiagnostic {
|
|
|
190
134
|
))
|
|
191
135
|
}
|
|
192
136
|
} else if declared(property, in: pageStyle) {
|
|
193
|
-
// The section takes the page's value (nothing closer overrode it).
|
|
194
137
|
pageReached.insert(property)
|
|
195
138
|
if !inert { pageRendered.insert(property) }
|
|
196
139
|
}
|
|
@@ -224,9 +167,6 @@ enum InertStyleDiagnostic {
|
|
|
224
167
|
return findings
|
|
225
168
|
}
|
|
226
169
|
|
|
227
|
-
/// `display` is positional, so it is never inert *in* a container — but on
|
|
228
|
-
/// a track that renders playable (`src` wins the rendering) it promises the
|
|
229
|
-
/// layout of a page that never opens.
|
|
230
170
|
private static func playableDisplayFinding(
|
|
231
171
|
_ section: Section, path: String, label: String,
|
|
232
172
|
) -> String? {
|
|
@@ -249,8 +189,6 @@ enum InertStyleDiagnostic {
|
|
|
249
189
|
)
|
|
250
190
|
}
|
|
251
191
|
|
|
252
|
-
/// The one message skeleton — every finding names the page, the declaration,
|
|
253
|
-
/// who declared it, why it can't render, and what to do about it.
|
|
254
192
|
private static func message(
|
|
255
193
|
path: String, owner: String, key: String, reason: String, hint: String,
|
|
256
194
|
) -> String {
|
|
@@ -267,9 +205,7 @@ enum InertStyleDiagnostic {
|
|
|
267
205
|
"\(count) track\(count == 1 ? "" : "s")"
|
|
268
206
|
}
|
|
269
207
|
|
|
270
|
-
// Nitro flattens the spec's `extends`, so
|
|
271
|
-
// hence two lookups over the same key set rather than one protocol.
|
|
272
|
-
|
|
208
|
+
// Nitro flattens the spec's `extends`, so `SectionStyle` and `TrackStyle` share no type.
|
|
273
209
|
private static func declared(_ property: Property, in style: SectionStyle?) -> Bool {
|
|
274
210
|
guard let style else { return false }
|
|
275
211
|
switch property {
|
|
@@ -285,7 +221,6 @@ enum InertStyleDiagnostic {
|
|
|
285
221
|
private static func declared(_ property: Property, in style: TrackStyle?) -> Bool {
|
|
286
222
|
guard let style else { return false }
|
|
287
223
|
switch property {
|
|
288
|
-
// Container properties have no Track slot to be declared in.
|
|
289
224
|
case .gridWrap, .gridTile: return false
|
|
290
225
|
case .imageShape: return style.imageShape != nil
|
|
291
226
|
case .accessorySymbol: return style.accessorySymbol != nil
|
|
@@ -3,18 +3,8 @@ import Foundation
|
|
|
3
3
|
import NitroModules
|
|
4
4
|
#endif
|
|
5
5
|
|
|
6
|
-
///
|
|
7
|
-
///
|
|
8
|
-
|
|
9
|
-
/// A track's `artwork` on the wire: a URL string, or `{ light, dark }`.
|
|
10
|
-
///
|
|
11
|
-
/// These models are the browse-response format as well as the persistence
|
|
12
|
-
/// format, so this is what decides whether a payload parses at all — a plain
|
|
13
|
-
/// `String?` here rejects the whole page with a type mismatch, however tolerant
|
|
14
|
-
/// the layers above it are.
|
|
15
|
-
///
|
|
16
|
-
/// Encodes back to whichever shape it came from, so a persisted snapshot
|
|
17
|
-
/// round-trips, and one written before pairs existed still decodes as `.single`.
|
|
6
|
+
/// A track's `artwork` on the wire: a URL string, or `{ light, dark }`. Encodes back to the
|
|
7
|
+
/// shape it came from, so a persisted snapshot round-trips.
|
|
18
8
|
enum JsonArtwork: Codable, Equatable {
|
|
19
9
|
case single(String)
|
|
20
10
|
case variants(light: String, dark: String)
|
|
@@ -44,7 +34,6 @@ enum JsonArtwork: Codable, Equatable {
|
|
|
44
34
|
}
|
|
45
35
|
|
|
46
36
|
extension JsonArtwork {
|
|
47
|
-
/// The Nitro union this maps onto, one case per case.
|
|
48
37
|
func toNitro() -> Variant_String_ArtworkVariants {
|
|
49
38
|
switch self {
|
|
50
39
|
case let .single(url): .first(url)
|
|
@@ -52,7 +41,6 @@ extension JsonArtwork {
|
|
|
52
41
|
}
|
|
53
42
|
}
|
|
54
43
|
|
|
55
|
-
/// Snapshot a live artwork value back to its JSON model.
|
|
56
44
|
init?(_ artwork: Variant_String_ArtworkVariants?) {
|
|
57
45
|
switch artwork {
|
|
58
46
|
case nil: return nil
|
|
@@ -62,18 +50,11 @@ extension JsonArtwork {
|
|
|
62
50
|
}
|
|
63
51
|
}
|
|
64
52
|
|
|
65
|
-
/// A style
|
|
66
|
-
/// `{ display?, gridWrap?, artworkRendering? }`.
|
|
67
|
-
///
|
|
68
|
-
/// One JSON model serves both the `TrackStyle` and `SectionStyle` positions —
|
|
69
|
-
/// keys that don't exist at the narrower position simply don't map.
|
|
53
|
+
/// A style block on the wire (ADR 0011), for both the track and the section position.
|
|
70
54
|
///
|
|
71
|
-
/// Decoding
|
|
72
|
-
///
|
|
73
|
-
///
|
|
74
|
-
/// decoders above this are strict, so a throw here would kill the whole
|
|
75
|
-
/// payload). `init(from:)` therefore never throws, and unknown enum values
|
|
76
|
-
/// map to nil at `toNitro` time.
|
|
55
|
+
/// Decoding never throws: a non-object value, a wrong-typed field or an unknown enum value
|
|
56
|
+
/// degrades to no declaration, because the decoders above are strict and a throw here fails
|
|
57
|
+
/// the whole page or the persisted playback state.
|
|
77
58
|
struct JsonStyle: Codable, Equatable {
|
|
78
59
|
var display: String? = nil
|
|
79
60
|
var gridWrap: Bool? = nil
|
|
@@ -87,8 +68,6 @@ struct JsonStyle: Codable, Equatable {
|
|
|
87
68
|
|
|
88
69
|
extension JsonStyle {
|
|
89
70
|
init(from decoder: Decoder) throws {
|
|
90
|
-
// A non-object value (the retired `style: 'grid'` string) decodes as an
|
|
91
|
-
// empty block rather than failing the parent.
|
|
92
71
|
guard let container = try? decoder.container(keyedBy: CodingKeys.self) else {
|
|
93
72
|
self.init()
|
|
94
73
|
return
|
|
@@ -107,12 +86,8 @@ extension JsonStyle {
|
|
|
107
86
|
}
|
|
108
87
|
|
|
109
88
|
extension JsonStyle {
|
|
110
|
-
///
|
|
111
|
-
///
|
|
112
|
-
/// that resolves to no declarations at all — `{}`, the tolerant decoder's
|
|
113
|
-
/// empty result for the retired string vocabulary, or all-unknown values —
|
|
114
|
-
/// maps to nil, so "no declaration" has one shape on every platform
|
|
115
|
-
/// (Android's lenient mapper makes the same collapse).
|
|
89
|
+
/// Maps the wire strings case-insensitively; an unknown value or an empty string is no
|
|
90
|
+
/// declaration, and a block left with none is nil, as Android's mapper does.
|
|
116
91
|
func toTrackStyle() -> TrackStyle? {
|
|
117
92
|
let declarations = trackDeclarations
|
|
118
93
|
return Self.declaresAnything(declarations) ? declarations : nil
|
|
@@ -122,8 +97,6 @@ extension JsonStyle {
|
|
|
122
97
|
let declarations = trackDeclarations
|
|
123
98
|
let gridTile = gridTile.flatMap { GridTile(fromString: $0.lowercased()) }
|
|
124
99
|
guard Self.declaresAnything(declarations) || gridWrap != nil || gridTile != nil else { return nil }
|
|
125
|
-
// Argument order is the generated init's (own properties before
|
|
126
|
-
// inherited ones — Nitro flattens `extends` own-props-first).
|
|
127
100
|
return SectionStyle(
|
|
128
101
|
gridWrap: gridWrap,
|
|
129
102
|
gridTile: gridTile,
|
|
@@ -136,13 +109,12 @@ extension JsonStyle {
|
|
|
136
109
|
)
|
|
137
110
|
}
|
|
138
111
|
|
|
139
|
-
/// The declarations a section shares with a track, each nil when absent or unknown.
|
|
140
112
|
private var trackDeclarations: TrackStyle {
|
|
141
113
|
TrackStyle(
|
|
142
114
|
display: display.flatMap { StyleDisplay(fromString: $0.lowercased()) },
|
|
143
115
|
artworkRendering: artworkRendering.flatMap { ArtworkRendering(fromString: $0.lowercased()) },
|
|
144
116
|
imageShape: imageShape.flatMap { ImageShape(fromString: $0.lowercased()) },
|
|
145
|
-
//
|
|
117
|
+
// 'none' is a legitimate symbol; only an empty string collapses.
|
|
146
118
|
accessorySymbol: accessorySymbol?.isEmpty == false ? accessorySymbol : nil,
|
|
147
119
|
cardTint: cardTint?.isEmpty == false ? cardTint : nil,
|
|
148
120
|
cardImage: cardImage.flatMap { CardImage(fromString: $0.lowercased()) },
|
|
@@ -154,9 +126,7 @@ extension JsonStyle {
|
|
|
154
126
|
|| style.accessorySymbol != nil || style.cardTint != nil || style.cardImage != nil
|
|
155
127
|
}
|
|
156
128
|
|
|
157
|
-
///
|
|
158
|
-
/// An all-nil block snapshots as no block — the decoders collapse it to
|
|
159
|
-
/// "no declaration" anyway, so never persist the distinction.
|
|
129
|
+
/// The persistable form of a live block; nil when it declares nothing.
|
|
160
130
|
init?(_ style: TrackStyle?) {
|
|
161
131
|
guard let style, Self.declaresAnything(style) else { return nil }
|
|
162
132
|
self.init(
|
|
@@ -202,9 +172,6 @@ extension JsonStyle {
|
|
|
202
172
|
}
|
|
203
173
|
}
|
|
204
174
|
|
|
205
|
-
/// JSON model for a page section (ADR 0010). Legacy `groupTitle`/`imageRow`
|
|
206
|
-
/// keys in payloads are simply unknown to these models and decode as
|
|
207
|
-
/// ignored dead weight.
|
|
208
175
|
struct JsonSection: Codable {
|
|
209
176
|
var title: String? = nil
|
|
210
177
|
var style: JsonStyle? = nil
|
|
@@ -212,7 +179,6 @@ struct JsonSection: Codable {
|
|
|
212
179
|
var children: [JsonTrack]
|
|
213
180
|
}
|
|
214
181
|
|
|
215
|
-
/// JSON model for per-track HTTP request configuration.
|
|
216
182
|
struct JsonTrackRequest: Codable {
|
|
217
183
|
let userAgent: String?
|
|
218
184
|
let headers: [String: String]?
|
|
@@ -223,7 +189,6 @@ struct JsonTrackRequest: Codable {
|
|
|
223
189
|
}
|
|
224
190
|
}
|
|
225
191
|
|
|
226
|
-
/// JSON model for resolved track (container with children).
|
|
227
192
|
struct JsonResolvedTrack: Codable {
|
|
228
193
|
var id: String? = nil
|
|
229
194
|
var path: String
|
|
@@ -246,7 +211,6 @@ struct JsonResolvedTrack: Codable {
|
|
|
246
211
|
var carPlaySiriListButton: String? = nil
|
|
247
212
|
}
|
|
248
213
|
|
|
249
|
-
/// JSON model for individual tracks.
|
|
250
214
|
struct JsonTrack: Codable {
|
|
251
215
|
var id: String? = nil
|
|
252
216
|
var path: String? = nil
|
|
@@ -270,17 +234,13 @@ struct JsonTrack: Codable {
|
|
|
270
234
|
// MARK: - Snapshot live Nitro types back to JSON models (for persistence)
|
|
271
235
|
|
|
272
236
|
extension JsonTrackRequest {
|
|
273
|
-
/// Snapshot a live TrackRequest back to its JSON model.
|
|
274
237
|
init(from request: TrackRequest) {
|
|
275
238
|
self.init(userAgent: request.userAgent, headers: request.headers, query: request.query)
|
|
276
239
|
}
|
|
277
240
|
}
|
|
278
241
|
|
|
279
242
|
extension JsonTrack {
|
|
280
|
-
///
|
|
281
|
-
/// The track's own declared style block and `disabled` persist (ADR 0011);
|
|
282
|
-
/// section/page-inherited values are never stamped onto tracks and
|
|
283
|
-
/// re-resolve at render, exactly as they do live.
|
|
243
|
+
/// Snapshots the persistable subset of a live Track. Its style is the track's own block; section- and page-inherited style re-resolves at render.
|
|
284
244
|
init(from track: Track) {
|
|
285
245
|
self.init(
|
|
286
246
|
id: track.id,
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import NitroModules
|
|
2
2
|
|
|
3
|
-
/// The browser's last navigation error and
|
|
4
|
-
/// newer report or a clear supersedes a display still being formatted.
|
|
3
|
+
/// The browser's last navigation error and its formatted display, as JS sees them.
|
|
5
4
|
@MainActor
|
|
6
5
|
final class NavigationErrorState {
|
|
7
6
|
private(set) var error: NavigationError? {
|
|
@@ -30,6 +29,8 @@ final class NavigationErrorState {
|
|
|
30
29
|
formatted = nil
|
|
31
30
|
}
|
|
32
31
|
|
|
32
|
+
/// Publishes `error` at once and its formatted display once `format` returns, unless a
|
|
33
|
+
/// later `report` or `clear` superseded it meanwhile.
|
|
33
34
|
func report(_ error: NavigationError, format: (NavigationError) async -> FormattedNavigationError) async {
|
|
34
35
|
generation &+= 1
|
|
35
36
|
let reported = generation
|
|
@@ -2,9 +2,8 @@ import Foundation
|
|
|
2
2
|
import NitroModules
|
|
3
3
|
import os.log
|
|
4
4
|
|
|
5
|
-
/// Turns a path into its page: matches the route, resolves its source
|
|
6
|
-
///
|
|
7
|
-
/// artwork). Also resolves the tabs and search routes.
|
|
5
|
+
/// Turns a path into its page: matches the route, resolves its source, then stamps contextual
|
|
6
|
+
/// paths and browse-time artwork. Also resolves the tabs and search routes.
|
|
8
7
|
@MainActor
|
|
9
8
|
final class PageResolver {
|
|
10
9
|
let logger = Logger(subsystem: "com.audiobrowser", category: "PageResolver")
|
|
@@ -18,28 +17,22 @@ final class PageResolver {
|
|
|
18
17
|
self.requests = requests
|
|
19
18
|
}
|
|
20
19
|
|
|
21
|
-
/// The page at `path`, uncached and without favorites hydrated.
|
|
20
|
+
/// The page at `path`, uncached and without favorites hydrated. A path no route matches is
|
|
21
|
+
/// fetched through the request and browse layers. The result carries `sections`, never
|
|
22
|
+
/// `children` (ADR 0010).
|
|
22
23
|
func resolve(_ path: String) async throws -> ResolvedTrack {
|
|
23
|
-
// Match an explicit route (or the '*' default). With no match, fall back to
|
|
24
|
-
// the implicit default: fetch the path via the request + browse config.
|
|
25
24
|
let routeEntry = config.routes.flatMap { SimpleRouter.browseRoute(for: path, in: $0) }
|
|
26
25
|
|
|
27
26
|
let resolvedTrack: ResolvedTrack = if let (entry, routeMatch) = routeEntry {
|
|
28
27
|
try await resolveRouteEntry(entry, path: path, params: routeMatch.params)
|
|
29
28
|
} else {
|
|
30
|
-
// Implicit default — no route config, just request → browse → fetch path.
|
|
31
29
|
try await requests.fetchPage(
|
|
32
30
|
nil, path: path, params: ["path": path],
|
|
33
31
|
)
|
|
34
32
|
}
|
|
35
33
|
|
|
36
|
-
// Normalize to the canonical sectioned shape (children sugar → one
|
|
37
|
-
// untitled section — ADR 0010), then validate and transform. The output
|
|
38
|
-
// never carries `children`.
|
|
39
34
|
if let sections = resolvedTrack.normalizedSections {
|
|
40
|
-
//
|
|
41
|
-
// level is still attributable. Every page passes here whatever its
|
|
42
|
-
// source, and only on a cache miss. No-op outside debug builds.
|
|
35
|
+
// Before the sections transform, while each level is still attributable (ADR 0011).
|
|
43
36
|
InertStyleDiagnostic.warn(path: path, pageStyle: resolvedTrack.style, sections: sections)
|
|
44
37
|
let transformed = try await transformSections(
|
|
45
38
|
sections, parentPath: path, routeEntry: routeEntry?.0,
|
|
@@ -50,15 +43,15 @@ final class PageResolver {
|
|
|
50
43
|
return resolvedTrack
|
|
51
44
|
}
|
|
52
45
|
|
|
53
|
-
/// The
|
|
46
|
+
/// The `__tabs__` route's page, flattened. Nil when there is no such route.
|
|
54
47
|
func tabs() async throws -> [Track]? {
|
|
55
48
|
guard let tabsEntry = config.routes?.first(where: { $0.path == SimpleRouter.tabsRoutePath }) else { return nil }
|
|
56
49
|
let resolved = try await resolveRouteEntry(tabsEntry, path: SimpleRouter.tabsRoutePath, params: [:])
|
|
57
|
-
// Tabs are a flat list, not a page: a sectioned tabs source flattens.
|
|
58
50
|
return resolved.flattenedChildren ?? []
|
|
59
51
|
}
|
|
60
52
|
|
|
61
|
-
/// The `__search__` route's results for `params`, unhydrated.
|
|
53
|
+
/// The `__search__` route's results for `params`, unhydrated. Throws `contentNotFound` when
|
|
54
|
+
/// that route is missing or has neither a callback nor a config.
|
|
62
55
|
func search(_ params: SearchParams) async throws -> [Track] {
|
|
63
56
|
guard let searchEntry = config.routes?.first(where: { $0.path == SimpleRouter.searchRoutePath }) else {
|
|
64
57
|
throw BrowserError.contentNotFound(path: SimpleRouter.searchRoutePath)
|
|
@@ -79,13 +72,10 @@ final class PageResolver {
|
|
|
79
72
|
path: String,
|
|
80
73
|
params: [String: String],
|
|
81
74
|
) async throws -> ResolvedTrack {
|
|
82
|
-
// Priority: callback > config > static
|
|
83
75
|
if let callback = entry.browseCallback {
|
|
84
76
|
let callbackParam = BrowserSourceCallbackParam(path: path, routeParams: params)
|
|
85
|
-
//
|
|
86
|
-
//
|
|
87
|
-
// into a 3-arm variant: sync track, sync error, or a Promise resolving to a
|
|
88
|
-
// BrowseResult (which is itself a ResolvedTrack | BrowseError variant).
|
|
77
|
+
// Nitro flattens `(ResolvedTrack | BrowseError) | Promise<BrowseResult>` into three arms:
|
|
78
|
+
// a sync track, a sync error, or a promise of the same two.
|
|
89
79
|
switch try await callback(callbackParam).await() {
|
|
90
80
|
case let .first(resolvedTrack):
|
|
91
81
|
return resolvedTrack
|
|
@@ -116,8 +106,8 @@ final class PageResolver {
|
|
|
116
106
|
|
|
117
107
|
// MARK: - Stamping
|
|
118
108
|
|
|
119
|
-
/// `sections`
|
|
120
|
-
/// context) resolved at once.
|
|
109
|
+
/// `sections` with contextual paths stamped and every track's browse-time artwork (no size
|
|
110
|
+
/// context) resolved, all tracks at once.
|
|
121
111
|
private func transformSections(
|
|
122
112
|
_ sections: [Section],
|
|
123
113
|
parentPath: String,
|
|
@@ -3,7 +3,7 @@ import Foundation
|
|
|
3
3
|
import NitroModules
|
|
4
4
|
#endif
|
|
5
5
|
|
|
6
|
-
///
|
|
6
|
+
/// The fields every request config kind (request, browse, media, artwork) has.
|
|
7
7
|
protocol RequestFieldValues<Method> {
|
|
8
8
|
associatedtype Method
|
|
9
9
|
var method: Method? { get }
|
|
@@ -36,7 +36,6 @@ extension RequestFields {
|
|
|
36
36
|
Self(method: nil, path: path, baseUrl: nil, headers: nil, query: nil, body: nil, contentType: nil, userAgent: nil)
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
/// `fields`' values, copied.
|
|
40
39
|
init(fieldsOf fields: some RequestFieldValues<Method>) {
|
|
41
40
|
self.init(
|
|
42
41
|
method: fields.method, path: fields.path, baseUrl: fields.baseUrl, headers: fields.headers,
|
|
@@ -45,8 +44,8 @@ extension RequestFields {
|
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
|
|
48
|
-
/// How Request-Config Layers compose
|
|
49
|
-
///
|
|
47
|
+
/// How Request-Config Layers compose (GLOSSARY.md). Android and the web stub follow the same
|
|
48
|
+
/// rules.
|
|
50
49
|
enum RequestLayer {
|
|
51
50
|
/// `override` over `base`, field by field; headers and query merge by key.
|
|
52
51
|
static func merge<C: RequestFields>(_ base: C, _ override: C) -> C {
|
|
@@ -62,8 +61,8 @@ enum RequestLayer {
|
|
|
62
61
|
)
|
|
63
62
|
}
|
|
64
63
|
|
|
65
|
-
///
|
|
66
|
-
/// the path.
|
|
64
|
+
/// `layer`'s fields over `base`, except the path, which stays `base`'s: only a transform
|
|
65
|
+
/// changes the path.
|
|
67
66
|
static func applyStatic<C: RequestFields>(_ layer: C, to base: C) -> C {
|
|
68
67
|
let merged = merge(base, layer)
|
|
69
68
|
return C(
|
|
@@ -72,8 +71,8 @@ enum RequestLayer {
|
|
|
72
71
|
)
|
|
73
72
|
}
|
|
74
73
|
|
|
75
|
-
/// Applies one layer
|
|
76
|
-
///
|
|
74
|
+
/// Applies one layer. With transforms, they replace its static fields entirely, each handed
|
|
75
|
+
/// the one before's result; without, its static fields apply over `base`.
|
|
77
76
|
nonisolated(nonsending) static func apply<C: RequestFields>(
|
|
78
77
|
_ layer: C,
|
|
79
78
|
transforms: [nonisolated(nonsending)(C) async throws -> C],
|
|
@@ -87,22 +86,20 @@ enum RequestLayer {
|
|
|
87
86
|
return result
|
|
88
87
|
}
|
|
89
88
|
|
|
90
|
-
/// The
|
|
91
|
-
/// neither produced one.
|
|
89
|
+
/// The sync config over the async one; nil only when both are nil.
|
|
92
90
|
static func mergeResolved<C: RequestFields>(async asyncResolved: C?, sync syncResolved: C?) -> C? {
|
|
93
91
|
guard let asyncResolved else { return syncResolved }
|
|
94
92
|
guard let syncResolved else { return asyncResolved }
|
|
95
93
|
return merge(asyncResolved, syncResolved)
|
|
96
94
|
}
|
|
97
95
|
|
|
98
|
-
///
|
|
96
|
+
/// Base URL, then path (or `defaultPath` when it has none), then query.
|
|
99
97
|
static func buildUrl(_ config: some RequestFields, defaultPath: String = "") -> String {
|
|
100
98
|
let url = BrowserPathHelper.buildUrl(baseUrl: config.baseUrl, path: config.path ?? defaultPath)
|
|
101
99
|
guard let query = config.query, !query.isEmpty else { return url }
|
|
102
100
|
return BrowserPathHelper.appendQuery(query, to: url)
|
|
103
101
|
}
|
|
104
102
|
|
|
105
|
-
/// `override`'s keys over `base`'s; nil only when both are nil.
|
|
106
103
|
static func mergeDicts(_ base: [String: String]?, _ override: [String: String]?) -> [String: String]? {
|
|
107
104
|
guard let base else { return override }
|
|
108
105
|
guard let override else { return base }
|
|
@@ -111,10 +108,9 @@ enum RequestLayer {
|
|
|
111
108
|
|
|
112
109
|
// MARK: - Artwork
|
|
113
110
|
|
|
114
|
-
/// An artwork request, in order: `artwork`
|
|
115
|
-
///
|
|
116
|
-
///
|
|
117
|
-
/// track without artwork, or when no path remains.
|
|
111
|
+
/// An artwork request, built in order: `artwork` over `base`, path included; what `resolve`
|
|
112
|
+
/// produces; `sizeQuery`; the transforms in turn; then `id` for `{id}`. Nil when `resolve`
|
|
113
|
+
/// produces nothing for a track without artwork, or when no path remains.
|
|
118
114
|
nonisolated(nonsending) static func artwork<C: RequestFields>(
|
|
119
115
|
_ artwork: C,
|
|
120
116
|
over base: C,
|
|
@@ -154,7 +150,7 @@ enum RequestLayer {
|
|
|
154
150
|
return request.path == nil ? nil : request
|
|
155
151
|
}
|
|
156
152
|
|
|
157
|
-
/// The
|
|
153
|
+
/// The query keys `params` names for `context`'s width and height, in whole pixels.
|
|
158
154
|
static func sizeQuery(_ params: ImageQueryParams?, _ context: ImageContext?) -> [String: String] {
|
|
159
155
|
guard let params, let context else { return [:] }
|
|
160
156
|
var query: [String: String] = [:]
|
|
@@ -163,15 +159,15 @@ enum RequestLayer {
|
|
|
163
159
|
return query
|
|
164
160
|
}
|
|
165
161
|
|
|
166
|
-
/// Whether `request` still carries an `{id}` token
|
|
162
|
+
/// Whether `request` still carries an `{id}` token, which means the track had no id.
|
|
167
163
|
static func hasUnfilledIdToken(_ request: some RequestFieldValues) -> Bool {
|
|
168
164
|
TrackIdTemplate.containsToken(request.path)
|
|
169
165
|
|| TrackIdTemplate.containsToken(request.query)
|
|
170
166
|
|| TrackIdTemplate.containsToken(request.headers)
|
|
171
167
|
}
|
|
172
168
|
|
|
173
|
-
///
|
|
174
|
-
///
|
|
169
|
+
/// `request.headers` plus `userAgent` and `contentType` as headers, unless a header already
|
|
170
|
+
/// sets them. Nil when there are none.
|
|
175
171
|
static func imageHeaders(_ request: some RequestFieldValues) -> [String: String]? {
|
|
176
172
|
var headers = request.headers ?? [:]
|
|
177
173
|
if let userAgent = request.userAgent, headers["User-Agent"] == nil {
|