react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -19
- 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/lib/commonjs/CLAUDE.md +7 -2
- package/lib/commonjs/features/battery.js +16 -12
- package/lib/commonjs/features/battery.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +1 -1
- package/lib/commonjs/features/browser.js +74 -24
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/carConnection.js +3 -4
- package/lib/commonjs/features/carConnection.js.map +1 -1
- package/lib/commonjs/features/equalizer.js +9 -5
- package/lib/commonjs/features/equalizer.js.map +1 -1
- package/lib/commonjs/features/errors.js +35 -21
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/favorites.js +15 -13
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/gate.js +12 -6
- package/lib/commonjs/features/gate.js.map +1 -1
- package/lib/commonjs/features/metadata.js +16 -14
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/network.js +5 -1
- package/lib/commonjs/features/network.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js +28 -14
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/output.js +8 -4
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +10 -5
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/playWhenReady.js +6 -5
- package/lib/commonjs/features/playback/playWhenReady.js.map +1 -1
- package/lib/commonjs/features/playback/playing.js +5 -3
- package/lib/commonjs/features/playback/playing.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +11 -5
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +3 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js +6 -1
- package/lib/commonjs/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/commonjs/features/playback/volume.js +6 -5
- package/lib/commonjs/features/playback/volume.js.map +1 -1
- package/lib/commonjs/features/player/options.js +20 -10
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +34 -38
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +0 -1
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +48 -20
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/queue/repeatMode.js +2 -1
- package/lib/commonjs/features/queue/repeatMode.js.map +1 -1
- package/lib/commonjs/features/queue/shuffle.js +0 -1
- package/lib/commonjs/features/queue/shuffle.js.map +1 -1
- package/lib/commonjs/features/remoteControls.js +59 -35
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/features/sleepTimer.js +15 -6
- package/lib/commonjs/features/sleepTimer.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +6 -9
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +13 -12
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +6 -4
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -1
- package/lib/commonjs/utils/useDebug.js +16 -3
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +2 -4
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/parseSearchResponse.js +3 -4
- package/lib/commonjs/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +1 -3
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/CLAUDE.md +7 -2
- package/lib/module/features/battery.js +16 -12
- package/lib/module/features/battery.js.map +1 -1
- package/lib/module/features/browser-config.js +1 -1
- package/lib/module/features/browser.js +74 -24
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/carConnection.js +3 -4
- package/lib/module/features/carConnection.js.map +1 -1
- package/lib/module/features/equalizer.js +9 -5
- package/lib/module/features/equalizer.js.map +1 -1
- package/lib/module/features/errors.js +35 -21
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/favorites.js +15 -13
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/gate.js +12 -6
- package/lib/module/features/gate.js.map +1 -1
- package/lib/module/features/metadata.js +16 -14
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/network.js +5 -1
- package/lib/module/features/network.js.map +1 -1
- package/lib/module/features/nowPlaying.js +28 -14
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/output.js +8 -4
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/controls.js +10 -5
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/playWhenReady.js +6 -5
- package/lib/module/features/playback/playWhenReady.js.map +1 -1
- package/lib/module/features/playback/playing.js +5 -3
- package/lib/module/features/playback/playing.js.map +1 -1
- package/lib/module/features/playback/progress.js +11 -5
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/state.js +3 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/playback/trackPlaybackTime.js +6 -1
- package/lib/module/features/playback/trackPlaybackTime.js.map +1 -1
- package/lib/module/features/playback/volume.js +6 -5
- package/lib/module/features/playback/volume.js.map +1 -1
- package/lib/module/features/player/options.js +20 -10
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +34 -38
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +0 -1
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +48 -20
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/queue/repeatMode.js +2 -1
- package/lib/module/features/queue/repeatMode.js.map +1 -1
- package/lib/module/features/queue/shuffle.js +0 -1
- package/lib/module/features/queue/shuffle.js.map +1 -1
- package/lib/module/features/remoteControls.js +59 -35
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/features/sleepTimer.js +15 -6
- package/lib/module/features/sleepTimer.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +6 -9
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +13 -12
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +6 -4
- package/lib/module/utils/getTrackIdentity.js.map +1 -1
- package/lib/module/utils/useDebug.js +16 -3
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +2 -4
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/parseSearchResponse.js +3 -4
- package/lib/module/web/browser/parseSearchResponse.js.map +1 -1
- package/lib/module/web/browser/sections.js +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +1 -3
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/features/battery.d.ts +17 -12
- package/lib/typescript/src/features/battery.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +64 -24
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/carConnection.d.ts +3 -4
- package/lib/typescript/src/features/carConnection.d.ts.map +1 -1
- package/lib/typescript/src/features/equalizer.d.ts +9 -5
- package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts +37 -22
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/favorites.d.ts +15 -13
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/gate.d.ts +14 -8
- package/lib/typescript/src/features/gate.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +37 -17
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/network.d.ts +5 -1
- package/lib/typescript/src/features/network.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +28 -14
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +10 -5
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playWhenReady.d.ts +6 -5
- package/lib/typescript/src/features/playback/playWhenReady.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/playing.d.ts +16 -3
- package/lib/typescript/src/features/playback/playing.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts +11 -5
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +8 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +9 -2
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/volume.d.ts +6 -5
- package/lib/typescript/src/features/playback/volume.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +52 -37
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts +65 -60
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +0 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +48 -20
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts +1 -1
- package/lib/typescript/src/features/queue/repeatMode.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts +0 -1
- package/lib/typescript/src/features/queue/shuffle.d.ts.map +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts +58 -25
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/features/sleepTimer.d.ts +15 -7
- package/lib/typescript/src/features/sleepTimer.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +54 -57
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +181 -144
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +6 -9
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +13 -12
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +6 -4
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts +16 -3
- package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/CLAUDE.md +7 -2
- package/src/docs-floors.test.ts +71 -0
- package/src/features/battery.ts +17 -13
- package/src/features/browser-config.ts +1 -1
- package/src/features/browser.ts +65 -24
- package/src/features/carConnection.ts +3 -4
- package/src/features/equalizer.ts +9 -5
- package/src/features/errors.ts +37 -22
- package/src/features/favorites.ts +15 -13
- package/src/features/gate.ts +14 -8
- package/src/features/metadata.ts +37 -17
- package/src/features/network.ts +5 -1
- package/src/features/nowPlaying.ts +28 -14
- package/src/features/output.ts +8 -4
- package/src/features/playback/controls.ts +10 -5
- package/src/features/playback/playWhenReady.ts +6 -5
- package/src/features/playback/playing.ts +16 -3
- package/src/features/playback/progress.ts +11 -5
- package/src/features/playback/state.ts +8 -3
- package/src/features/playback/trackPlaybackTime.ts +9 -2
- package/src/features/playback/volume.ts +6 -5
- package/src/features/player/options.ts +54 -43
- package/src/features/player/setup.ts +67 -61
- package/src/features/queue/activeTrack.ts +0 -1
- package/src/features/queue/queue.ts +48 -20
- package/src/features/queue/repeatMode.ts +1 -1
- package/src/features/queue/shuffle.ts +0 -1
- package/src/features/remoteControls.ts +59 -35
- package/src/features/sleepTimer.ts +15 -7
- package/src/types/browser-nodes.ts +54 -57
- package/src/types/browser.ts +183 -146
- package/src/utils/LazyNativeEmitter.ts +6 -9
- package/src/utils/NativeUpdatedValue.ts +13 -12
- package/src/utils/getTrackIdentity.ts +6 -4
- package/src/utils/useDebug.ts +16 -3
- package/src/web/NativeAudioBrowser.ts +2 -4
- package/src/web/browser/parseSearchResponse.ts +3 -4
- package/src/web/browser/sections.ts +1 -1
- package/src/web/util/BrowserPathHelper.ts +1 -3
- package/website/guide/android-auto.md +25 -13
- package/website/guide/android-certificates.md +199 -120
- package/website/guide/artwork.md +93 -48
- package/website/guide/audio-output.md +86 -68
- package/website/guide/automotive.md +15 -10
- package/website/guide/basic-usage.md +5 -2
- package/website/guide/battery.md +50 -23
- package/website/guide/browser.md +155 -68
- package/website/guide/carplay.md +132 -49
- package/website/guide/configuration.md +85 -49
- package/website/guide/equalizer.md +36 -32
- package/website/guide/errors.md +106 -64
- package/website/guide/favorites.md +41 -31
- package/website/guide/gate.md +24 -10
- package/website/guide/getting-started.md +55 -2
- package/website/guide/hooks.md +53 -47
- package/website/guide/live-streams.md +80 -49
- package/website/guide/metadata.md +87 -53
- package/website/guide/migrating-from-track-player.md +94 -49
- package/website/guide/native-callback-fetch.md +46 -36
- package/website/guide/network.md +36 -20
- package/website/guide/now-playing.md +72 -44
- package/website/guide/playback.md +112 -35
- package/website/guide/queue.md +77 -43
- package/website/guide/remote-controls.md +87 -29
- package/website/guide/search.md +37 -22
- package/website/guide/sleep-timer.md +35 -14
- package/website/guide/track.md +59 -35
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
import os.log
|
|
3
3
|
|
|
4
|
-
///
|
|
4
|
+
/// Counterpart of the Kotlin `HttpClient`; change request building and error messages in both.
|
|
5
5
|
final class HttpClient: @unchecked Sendable {
|
|
6
6
|
static let defaultUserAgent = "react-native-audio-browser"
|
|
7
7
|
static let defaultContentType = "application/json"
|
|
@@ -10,7 +10,6 @@ final class HttpClient: @unchecked Sendable {
|
|
|
10
10
|
private let session: URLSession
|
|
11
11
|
private let logger = Logger(subsystem: "com.audiobrowser", category: "HttpClient")
|
|
12
12
|
|
|
13
|
-
/// HTTP request configuration (matches Kotlin HttpClient.HttpRequest).
|
|
14
13
|
struct HttpRequest {
|
|
15
14
|
let url: String
|
|
16
15
|
let method: HttpMethod
|
|
@@ -20,7 +19,7 @@ final class HttpClient: @unchecked Sendable {
|
|
|
20
19
|
let userAgent: String
|
|
21
20
|
}
|
|
22
21
|
|
|
23
|
-
/// A non-2xx response
|
|
22
|
+
/// A non-2xx response.
|
|
24
23
|
struct HttpException: LocalizedError {
|
|
25
24
|
let code: Int
|
|
26
25
|
let responseBody: String
|
|
@@ -100,6 +99,7 @@ final class HttpClient: @unchecked Sendable {
|
|
|
100
99
|
}
|
|
101
100
|
|
|
102
101
|
/// Sends `httpRequest` and decodes a 2xx body as `T`; any other status throws `HttpException`.
|
|
102
|
+
/// A GET sends no body; HEAD and OPTIONS throw `HttpClientError.unsupportedMethod`.
|
|
103
103
|
func requestJson<T: Decodable>(_ httpRequest: HttpRequest, as type: T.Type) async throws -> T {
|
|
104
104
|
let (code, data) = try await request(httpRequest)
|
|
105
105
|
guard (200 ..< 300).contains(code) else {
|
|
@@ -6,14 +6,13 @@ import NitroModules
|
|
|
6
6
|
import os.log
|
|
7
7
|
|
|
8
8
|
public extension HybridAudioBrowser {
|
|
9
|
-
/// Navigates the in-app browser, reporting a failure as the navigation error.
|
|
10
|
-
/// synchronous
|
|
9
|
+
/// Navigates the in-app browser, reporting a failure as the navigation error. The clear is
|
|
10
|
+
/// synchronous, so JS hears it before the navigation that may set the error again.
|
|
11
11
|
internal func navigate(_ path: String, clearError: Bool) {
|
|
12
12
|
if clearError { onMainActor { navigationError.clear() } }
|
|
13
13
|
Task { @MainActor in await loadPath(path) }
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
/// Loads `path` into the browser, reporting a failure as the navigation error.
|
|
17
16
|
@MainActor
|
|
18
17
|
private func loadPath(_ path: String) async {
|
|
19
18
|
do {
|
|
@@ -37,7 +36,6 @@ public extension HybridAudioBrowser {
|
|
|
37
36
|
}
|
|
38
37
|
|
|
39
38
|
func navigateTrack(track: Track) throws {
|
|
40
|
-
// @MainActor: `player` is main-confined.
|
|
41
39
|
Task { @MainActor in
|
|
42
40
|
guard let player else { return }
|
|
43
41
|
let result = await trackSelector.select(track: track, player: player)
|
|
@@ -74,15 +72,13 @@ public extension HybridAudioBrowser {
|
|
|
74
72
|
onMainActor { navigationError.formatted }
|
|
75
73
|
}
|
|
76
74
|
|
|
77
|
-
///
|
|
78
|
-
///
|
|
79
|
-
/// `/…`), so it can't collide with one; kept internal — the public API is
|
|
80
|
-
/// `invalidateAllContent()`.
|
|
75
|
+
/// Sent on `externalContentChangedEmitter` to make CarPlay refresh every displayed template.
|
|
76
|
+
/// Paths always start with `/`, so it can't collide with one.
|
|
81
77
|
internal static let invalidateAllSentinel = "__rnab_invalidate_all__"
|
|
82
78
|
|
|
83
79
|
func notifyContentChanged(path: String) throws {
|
|
84
|
-
// Throws on a contextual path
|
|
85
|
-
//
|
|
80
|
+
// Throws on a contextual path, as Android's `require` does: the caller must pass the
|
|
81
|
+
// container path, or the invalidation silently hits nothing.
|
|
86
82
|
let isCurrentPath = try onMainActor {
|
|
87
83
|
try browserManager.invalidateContentCache(path)
|
|
88
84
|
return browserManager.path == path
|
|
@@ -97,7 +93,6 @@ public extension HybridAudioBrowser {
|
|
|
97
93
|
await self.reportNavigationError(error, path: path)
|
|
98
94
|
}
|
|
99
95
|
}
|
|
100
|
-
// Tell external controllers (CarPlay) to refresh every displayed template.
|
|
101
96
|
externalContentChangedEmitter.emit(Self.invalidateAllSentinel)
|
|
102
97
|
}
|
|
103
98
|
|
|
@@ -117,13 +112,12 @@ public extension HybridAudioBrowser {
|
|
|
117
112
|
|
|
118
113
|
// MARK: - Car Connection (CarPlay)
|
|
119
114
|
|
|
120
|
-
/// Static because the CarPlay scene can connect before the
|
|
121
|
-
///
|
|
115
|
+
/// Static because the CarPlay scene can connect before JS creates the shared instance
|
|
116
|
+
/// (cold start in the car).
|
|
122
117
|
internal nonisolated(unsafe) static var carPlayConnected = false
|
|
123
118
|
|
|
124
|
-
/// Called by the CarPlay scene delegate
|
|
125
|
-
///
|
|
126
|
-
/// cycle on a JS reload and would emit spurious connection changes.
|
|
119
|
+
/// Called by the CarPlay scene delegate on scene connect/disconnect only, not on controller
|
|
120
|
+
/// start/stop, which also cycle on a JS reload and would emit spurious changes.
|
|
127
121
|
internal static func setCarPlayConnected(_ connected: Bool) {
|
|
128
122
|
guard carPlayConnected != connected else { return }
|
|
129
123
|
carPlayConnected = connected
|
|
@@ -12,11 +12,10 @@ public extension HybridAudioBrowser {
|
|
|
12
12
|
Promise.async {
|
|
13
13
|
await MainActor.run { [weak self] in
|
|
14
14
|
guard let self else { return }
|
|
15
|
-
//
|
|
15
|
+
// Sets the category only; the session activates when playback produces output.
|
|
16
16
|
self.audioSession.configure(options.ios)
|
|
17
17
|
|
|
18
|
-
// A re-setup
|
|
19
|
-
// and un-published first. No-op on first setup.
|
|
18
|
+
// A re-setup replaces the player, so the outgoing one is torn down first. No-op on first setup.
|
|
20
19
|
destroyPlayer()
|
|
21
20
|
|
|
22
21
|
let newEngine = AVPlayerEngine(
|
|
@@ -38,9 +37,8 @@ public extension HybridAudioBrowser {
|
|
|
38
37
|
// `options.keepSessionAliveOnError` is ignored: on iOS an error never clears the now-playing
|
|
39
38
|
// info, and next/previous follow the queue, not the state.
|
|
40
39
|
|
|
41
|
-
//
|
|
42
|
-
//
|
|
43
|
-
// calls resolve by strict last-write-wins, then apply everything to the live player.
|
|
40
|
+
// Stage the state before applying it, so setup options and pre-setup setter calls
|
|
41
|
+
// resolve by strict last-write-wins.
|
|
44
42
|
if let bundled = options.options { updateOptions(options: bundled) }
|
|
45
43
|
if let mode = options.repeatMode { pendingRepeatMode = mode }
|
|
46
44
|
if let intent = options.playWhenReady { pendingPlayWhenReady = intent }
|
|
@@ -52,9 +50,8 @@ public extension HybridAudioBrowser {
|
|
|
52
50
|
}
|
|
53
51
|
}
|
|
54
52
|
|
|
55
|
-
/// Applies
|
|
56
|
-
///
|
|
57
|
-
/// stale state.
|
|
53
|
+
/// Applies state staged before the player existed, by setup options or pre-setup setters.
|
|
54
|
+
/// Consumed on apply so a later re-setup doesn't replay it.
|
|
58
55
|
@MainActor
|
|
59
56
|
private func applyPendingPlayerState() {
|
|
60
57
|
guard let player else { return }
|
|
@@ -39,7 +39,6 @@ public extension HybridAudioBrowser {
|
|
|
39
39
|
|
|
40
40
|
func setPlayWhenReady(playWhenReady: Bool) throws {
|
|
41
41
|
onMainActor {
|
|
42
|
-
// Pre-setup this stages the intent for the player to come up with — never a no-op.
|
|
43
42
|
if let player { player.setPlayWhenReady(playWhenReady) }
|
|
44
43
|
else { pendingPlayWhenReady = playWhenReady }
|
|
45
44
|
}
|
|
@@ -103,7 +102,6 @@ public extension HybridAudioBrowser {
|
|
|
103
102
|
|
|
104
103
|
func setRepeatMode(mode: RepeatMode) throws {
|
|
105
104
|
onMainActor {
|
|
106
|
-
// Pre-setup this stages the mode for the player to come up with — never a no-op.
|
|
107
105
|
if let player { player.repeatMode = mode }
|
|
108
106
|
else { pendingRepeatMode = mode }
|
|
109
107
|
}
|
|
@@ -122,8 +120,8 @@ public extension HybridAudioBrowser {
|
|
|
122
120
|
}
|
|
123
121
|
|
|
124
122
|
func retry() throws {
|
|
125
|
-
// Re-
|
|
126
|
-
//
|
|
123
|
+
// Re-resolves rather than replaying the cached URL: short-lived URLs or tokens may have
|
|
124
|
+
// expired since the failure.
|
|
127
125
|
onMainActor { player?.reloadResolving(startFromCurrentTime: true) }
|
|
128
126
|
}
|
|
129
127
|
|
|
@@ -175,7 +173,7 @@ public extension HybridAudioBrowser {
|
|
|
175
173
|
func remove(indexes: [Double]) throws {
|
|
176
174
|
try onMainActor {
|
|
177
175
|
guard let player else { return }
|
|
178
|
-
//
|
|
176
|
+
// Highest index first, so earlier removals don't shift the ones still to go.
|
|
179
177
|
for index in indexes.sorted().reversed() {
|
|
180
178
|
try player.remove(Int(index))
|
|
181
179
|
}
|
|
@@ -225,7 +223,7 @@ public extension HybridAudioBrowser {
|
|
|
225
223
|
try onMainActor {
|
|
226
224
|
guard let player, let track = player.currentTrack, let identity = track.identity else { return false }
|
|
227
225
|
browserManager.setFavorited(identity: identity, favorited: favorited)
|
|
228
|
-
//
|
|
226
|
+
// Hydration never overrides a track's own flag, so the queued copy must carry it.
|
|
229
227
|
let updated = track.copying(favorited: favorited)
|
|
230
228
|
try player.replace(player.queue.currentIndex, updated)
|
|
231
229
|
// The only emit: a favorite toggle mutates the active track in place, so
|
|
@@ -237,8 +235,6 @@ public extension HybridAudioBrowser {
|
|
|
237
235
|
}
|
|
238
236
|
}
|
|
239
237
|
|
|
240
|
-
/// Whether the active (now-playing) track is favorited, per the authoritative
|
|
241
|
-
/// favorite set (via `getActiveTrack`'s hydration).
|
|
242
238
|
internal func isActiveTrackFavorited() -> Bool {
|
|
243
239
|
(try? getActiveTrack())?.favorited ?? false
|
|
244
240
|
}
|
|
@@ -279,10 +275,8 @@ public extension HybridAudioBrowser {
|
|
|
279
275
|
}
|
|
280
276
|
|
|
281
277
|
func getActiveTrack() throws -> Track? {
|
|
282
|
-
//
|
|
283
|
-
//
|
|
284
|
-
// kept in sync as favorites change. This is the single source of truth for
|
|
285
|
-
// "is the active track favorited" (now-playing heart, toggle direction, JS).
|
|
278
|
+
// The now-playing track is loaded outside the browse cache: a missing `favorited` is filled
|
|
279
|
+
// from the favorite set, but a track's own value wins, so writers must update the queued copy too.
|
|
286
280
|
onMainActor { player?.currentTrack.map(browserManager.hydrateFavorite) }
|
|
287
281
|
}
|
|
288
282
|
|
|
@@ -307,8 +301,8 @@ public extension HybridAudioBrowser {
|
|
|
307
301
|
// MARK: - Network
|
|
308
302
|
|
|
309
303
|
func getOnline() throws -> Bool {
|
|
310
|
-
// No `onMainActor` hop: `isOnline` is lock-protected, so this stays a
|
|
311
|
-
//
|
|
304
|
+
// No `onMainActor` hop: `isOnline` is lock-protected, so this stays a cheap read on the
|
|
305
|
+
// JS thread instead of blocking on the main queue.
|
|
312
306
|
networkMonitor.isOnline
|
|
313
307
|
}
|
|
314
308
|
|
|
@@ -319,8 +313,6 @@ public extension HybridAudioBrowser {
|
|
|
319
313
|
}
|
|
320
314
|
|
|
321
315
|
func setSystemVolume(volume _: Double) throws {
|
|
322
|
-
// iOS doesn't provide a public API to set system volume programmatically.
|
|
323
|
-
// Users must adjust volume via hardware buttons or Control Center.
|
|
324
316
|
logger.debug("setSystemVolume is not supported on iOS - volume must be adjusted via hardware buttons or Control Center")
|
|
325
317
|
}
|
|
326
318
|
|
|
@@ -13,9 +13,8 @@ extension HybridAudioBrowser: PlayerCallbacks, AVPlayerEngineCallbacks {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
public func playerDidChangeActiveTrack(_ event: PlaybackActiveTrackChangedEvent) {
|
|
16
|
-
//
|
|
17
|
-
//
|
|
18
|
-
// Player emits the raw queue track, whose flag isn't kept in sync.
|
|
16
|
+
// The queue track's `favorited` is not kept in sync; hydrate it so useActiveTrack matches
|
|
17
|
+
// getActiveTrack().
|
|
19
18
|
let hydrated = PlaybackActiveTrackChangedEvent(
|
|
20
19
|
lastIndex: event.lastIndex,
|
|
21
20
|
lastTrack: event.lastTrack,
|
|
@@ -126,8 +125,8 @@ extension HybridAudioBrowser: PlayerCallbacks, AVPlayerEngineCallbacks {
|
|
|
126
125
|
}
|
|
127
126
|
}
|
|
128
127
|
|
|
129
|
-
/// Runs JS's
|
|
130
|
-
///
|
|
128
|
+
/// Runs JS's handler for a remote command if it set one, else `fallback`; reports the command
|
|
129
|
+
/// to JS either way.
|
|
131
130
|
private func dispatchRemote(handler: (() -> Void)?, report: () -> Void, fallback: () -> Void) {
|
|
132
131
|
if let handler { handler() } else { fallback() }
|
|
133
132
|
report()
|
|
@@ -9,20 +9,19 @@ public extension HybridAudioBrowser {
|
|
|
9
9
|
// MARK: - Equalizer (unsupported on iOS)
|
|
10
10
|
|
|
11
11
|
func getEqualizerSettings() throws -> EqualizerSettings? {
|
|
12
|
-
// No-op: equalizer unsupported on iOS
|
|
13
12
|
nil
|
|
14
13
|
}
|
|
15
14
|
|
|
16
15
|
func setEqualizerEnabled(enabled _: Bool) throws {
|
|
17
|
-
//
|
|
16
|
+
// Unsupported on iOS.
|
|
18
17
|
}
|
|
19
18
|
|
|
20
19
|
func setEqualizerPreset(preset _: String) throws {
|
|
21
|
-
//
|
|
20
|
+
// Unsupported on iOS.
|
|
22
21
|
}
|
|
23
22
|
|
|
24
23
|
func setEqualizerLevels(levels _: [Double]) throws {
|
|
25
|
-
//
|
|
24
|
+
// Unsupported on iOS.
|
|
26
25
|
}
|
|
27
26
|
|
|
28
27
|
// MARK: - Battery (Android-only, stub implementations)
|
|
@@ -32,15 +31,14 @@ public extension HybridAudioBrowser {
|
|
|
32
31
|
}
|
|
33
32
|
|
|
34
33
|
func getBatteryOptimizationStatus() throws -> BatteryOptimizationStatus {
|
|
35
|
-
// iOS doesn't have battery optimization restrictions like Android
|
|
36
34
|
.unrestricted
|
|
37
35
|
}
|
|
38
36
|
|
|
39
37
|
func dismissBatteryWarning() throws {
|
|
40
|
-
//
|
|
38
|
+
// Nothing to do on iOS.
|
|
41
39
|
}
|
|
42
40
|
|
|
43
41
|
func openBatterySettings() throws {
|
|
44
|
-
//
|
|
42
|
+
// Nothing to do on iOS.
|
|
45
43
|
}
|
|
46
44
|
}
|
|
@@ -5,6 +5,8 @@ import MediaPlayer
|
|
|
5
5
|
import NitroModules
|
|
6
6
|
import os.log
|
|
7
7
|
|
|
8
|
+
/// The shared browser and its player, ready once the browser is configured and the player is
|
|
9
|
+
/// set up; CarPlay and Siri wait on it.
|
|
8
10
|
@MainActor let playerAndConfiguredBrowser = ReadyValue<(HybridAudioBrowser, Player)> {
|
|
9
11
|
guard let browser = HybridAudioBrowser.shared,
|
|
10
12
|
browser.browserManager.isConfigured,
|
|
@@ -12,32 +14,27 @@ import os.log
|
|
|
12
14
|
return (browser, player)
|
|
13
15
|
}
|
|
14
16
|
|
|
15
|
-
///
|
|
16
|
-
///
|
|
17
|
+
/// Carries a non-Sendable value out of `MainActor.assumeIsolated`. Safe only while the caller
|
|
18
|
+
/// blocks until the main-actor work completes.
|
|
17
19
|
private struct UncheckedSendableBox<T>: @unchecked Sendable { let value: T }
|
|
18
20
|
|
|
19
|
-
/// `@unchecked Sendable` because
|
|
20
|
-
///
|
|
21
|
-
///
|
|
22
|
-
/// means the compiler won't tell you when a new one needs it.
|
|
21
|
+
/// `@unchecked Sendable` because the spec's requirements are nonisolated and Nitro calls them
|
|
22
|
+
/// synchronously on the JS thread, so the class can't be `@MainActor`. Isolation is per-property,
|
|
23
|
+
/// and the compiler won't say when a new property needs it.
|
|
23
24
|
public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
24
25
|
let logger = Logger(subsystem: "com.audiobrowser", category: "AudioBrowser")
|
|
25
26
|
|
|
26
27
|
// MARK: - Shared Instance for CarPlay
|
|
27
28
|
|
|
28
|
-
/// Shared instance for CarPlay access. Set when HybridAudioBrowser is created.
|
|
29
29
|
private(set) nonisolated(unsafe) weak static var shared: HybridAudioBrowser?
|
|
30
30
|
|
|
31
|
-
/// Fires when a new instance becomes `shared` (
|
|
32
|
-
///
|
|
33
|
-
/// listeners sit on the previous instance's emitters and would otherwise go
|
|
34
|
-
/// silent.
|
|
31
|
+
/// Fires when a new instance becomes `shared` (a JS reload), so CarPlay re-subscribes: its
|
|
32
|
+
/// listeners on the previous instance's emitters would go silent.
|
|
35
33
|
static let instanceChangedEmitter = Emitter<Void>()
|
|
36
34
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
/// needs no React-Core dependency.
|
|
35
|
+
// React Native posts this when a JS reload starts, before the old runtime is destroyed: the
|
|
36
|
+
// earliest sign this instance's JS callbacks go stale (the replacement's `init` drops them only
|
|
37
|
+
// once the new runtime is up). Observed by name, so the library needs no React-Core dependency.
|
|
41
38
|
@MainActor private static let reloadObserver: NSObjectProtocol = NotificationCenter.default.addObserver(
|
|
42
39
|
forName: Notification.Name("RCTTriggerReloadCommandNotification"),
|
|
43
40
|
object: nil,
|
|
@@ -50,19 +47,17 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
50
47
|
|
|
51
48
|
// MARK: - Private Properties
|
|
52
49
|
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
// Main-confined by convention, not annotation: `deinit` reads it and can't hop. Reach it from
|
|
51
|
+
// `onMainActor` or `@MainActor`.
|
|
55
52
|
var player: Player?
|
|
56
|
-
/// The media stack under `player`, for what only AVFoundation has: now playing, buffering,
|
|
57
|
-
/// volume and the remote commands.
|
|
58
53
|
var engine: AVPlayerEngine?
|
|
59
54
|
let networkMonitor = NetworkMonitor()
|
|
60
55
|
let browserManager = BrowserManager()
|
|
61
56
|
let browseGate = BrowseGate()
|
|
62
57
|
let trackSelector: TrackSelector
|
|
63
58
|
@MainActor private(set) lazy var audioSession = AudioSessionController()
|
|
64
|
-
|
|
65
|
-
|
|
59
|
+
// Player state set before the player exists, by setup options or the setters; last write wins,
|
|
60
|
+
// consumed when the player comes up.
|
|
66
61
|
@MainActor var pendingPlayWhenReady: Bool?
|
|
67
62
|
@MainActor var pendingRepeatMode: RepeatMode?
|
|
68
63
|
@MainActor let playerOptions = PlayerUpdateOptions()
|
|
@@ -80,20 +75,17 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
80
75
|
public let repeatModeChangedEmitter = Emitter<RepeatModeChangedEvent>()
|
|
81
76
|
public let shuffleChangedEmitter = Emitter<Bool>()
|
|
82
77
|
public let externalContentChangedEmitter = Emitter<String>()
|
|
83
|
-
///
|
|
84
|
-
///
|
|
85
|
-
/// the user lands on the playing station (with the rest of the results in Up
|
|
86
|
-
/// Next) rather than the screen they invoked Siri from. No-op where unobserved.
|
|
78
|
+
/// Fires when a voice intent starts playback, so CarPlay shows the Now Playing template rather
|
|
79
|
+
/// than the screen Siri was invoked from.
|
|
87
80
|
public let showNowPlayingRequestedEmitter = Emitter<Void>()
|
|
88
|
-
/// Fires after `updateOptions` applies a change, so
|
|
89
|
-
///
|
|
90
|
-
/// (now-playing buttons, Up Next).
|
|
81
|
+
/// Fires after `updateOptions` applies a change, so CarPlay refreshes its now-playing buttons and
|
|
82
|
+
/// Up Next.
|
|
91
83
|
public let playerOptionsChangedEmitter = Emitter<Void>()
|
|
92
84
|
|
|
93
85
|
// MARK: - Thread Safety
|
|
94
86
|
|
|
95
|
-
/// Runs
|
|
96
|
-
///
|
|
87
|
+
/// Runs `work` on the main actor and waits for it; from another thread it blocks on
|
|
88
|
+
/// `DispatchQueue.main.sync`, which is what makes a non-Sendable result safe to return.
|
|
97
89
|
func onMainActor<T>(_ work: @MainActor () throws -> T) rethrows -> T {
|
|
98
90
|
if Thread.isMainThread {
|
|
99
91
|
try MainActor.assumeIsolated { try UncheckedSendableBox(value: work()) }.value
|
|
@@ -116,7 +108,7 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
116
108
|
|
|
117
109
|
public var tabs: [Track]? {
|
|
118
110
|
get { onMainActor { browserManager.tabs } }
|
|
119
|
-
set { /* tabs
|
|
111
|
+
set { /* browserManager owns the tabs; JS cannot set them */ }
|
|
120
112
|
}
|
|
121
113
|
|
|
122
114
|
public var configuration: NativeBrowserConfiguration = .init(
|
|
@@ -126,9 +118,8 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
126
118
|
formatNavigationError: nil,
|
|
127
119
|
) {
|
|
128
120
|
didSet {
|
|
129
|
-
// Copied
|
|
130
|
-
//
|
|
131
|
-
// std::string/std::function — from the JS thread while it runs.
|
|
121
|
+
// Copied on the setter's thread: the Task below outlives this call, and Nitro can reassign
|
|
122
|
+
// `configuration` (a C++ struct holding std::string/std::function) from the JS thread.
|
|
132
123
|
let configuredPath = configuration.path
|
|
133
124
|
onMainActor { browserManager.config = BrowserConfig(from: configuration) }
|
|
134
125
|
|
|
@@ -150,29 +141,21 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
150
141
|
public var onNavigationError: (NavigationErrorEvent) -> Void = { _ in }
|
|
151
142
|
public var onFormattedNavigationError: (FormattedNavigationError?) -> Void = { _ in }
|
|
152
143
|
|
|
153
|
-
///
|
|
154
|
-
///
|
|
155
|
-
/// what chrome. The double `Promise` mirrors every other native→JS
|
|
156
|
-
/// value-returning callback (e.g. `searchCallback`): the outer resolves to the
|
|
157
|
-
/// JS-side Promise, the inner to the decision.
|
|
144
|
+
/// Whether a browse path or search interaction is gated, and with what gate; set by JS. The
|
|
145
|
+
/// outer Promise resolves to JS's Promise, the inner to the decision.
|
|
158
146
|
///
|
|
159
|
-
///
|
|
160
|
-
///
|
|
161
|
-
///
|
|
162
|
-
///
|
|
163
|
-
/// in that window would be a fail-open leak — same direction as the
|
|
164
|
-
/// resolver-error path in `BrowseGate.decide`. Matches Android's default.
|
|
147
|
+
/// The default fails closed (`gated: true`). It answers only in the window where the gate is
|
|
148
|
+
/// resolved but JS has not (re)bound its resolver (a JS reload, CarPlay deciding its tabs at
|
|
149
|
+
/// scene connect); serving content there would leak, like the resolver-error path in
|
|
150
|
+
/// `BrowseGate.decide`. Android defaults the same way.
|
|
165
151
|
public var resolveGate: (NativeGateRequest) -> Promise<Promise<GateDecision>> = HybridAudioBrowser.defaultResolveGate
|
|
166
152
|
|
|
167
|
-
// Computed, not stored: a nonisolated static holding a non-Sendable closure
|
|
168
|
-
// is rejected under Swift 6 concurrency checking.
|
|
169
153
|
static var defaultResolveGate: (NativeGateRequest) -> Promise<Promise<GateDecision>> {
|
|
170
154
|
{ _ in
|
|
171
155
|
Promise.resolved(withResult: Promise.resolved(withResult: GateDecision(gated: true, gate: nil)))
|
|
172
156
|
}
|
|
173
157
|
}
|
|
174
158
|
|
|
175
|
-
/// Fired when a request is gated (served the gate). Set by JS.
|
|
176
159
|
public var onGate: (GateEvent) -> Void = { _ in }
|
|
177
160
|
|
|
178
161
|
// MARK: - Player Callbacks
|
|
@@ -242,8 +225,8 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
242
225
|
|
|
243
226
|
public var onCarConnectedChanged: (Bool) -> Void = { _ in } {
|
|
244
227
|
didSet {
|
|
245
|
-
//
|
|
246
|
-
// this JS runtime subscribed
|
|
228
|
+
// A new subscriber hears the current state at once: the scene may have connected before
|
|
229
|
+
// this JS runtime subscribed.
|
|
247
230
|
onCarConnectedChanged(HybridAudioBrowser.carPlayConnected)
|
|
248
231
|
}
|
|
249
232
|
}
|
|
@@ -254,18 +237,16 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
254
237
|
trackSelector = TrackSelector(browserManager: browserManager)
|
|
255
238
|
super.init()
|
|
256
239
|
|
|
257
|
-
//
|
|
258
|
-
// player so two audio streams never run at once.
|
|
240
|
+
// Stops the previous instance's player (a JS reload) so two streams never play at once.
|
|
259
241
|
onMainActor {
|
|
260
|
-
// Statics are lazy
|
|
261
|
-
// instance onward.
|
|
242
|
+
// Statics are lazy: touching the observer installs it from the first instance on.
|
|
262
243
|
_ = HybridAudioBrowser.reloadObserver
|
|
263
244
|
HybridAudioBrowser.shared?.destroyPlayer()
|
|
264
245
|
HybridAudioBrowser.shared?.dropStaleJSCallbacks()
|
|
265
246
|
HybridAudioBrowser.shared = self
|
|
266
247
|
audioSession.outputChanged.addListener { [weak self] in self?.onOutputChanged($0) }
|
|
267
248
|
audioSession.volumeChanged.addListener { [weak self] in self?.onSystemVolumeChanged($0) }
|
|
268
|
-
//
|
|
249
|
+
// Registered whether or not JS subscribes: the player needs it too.
|
|
269
250
|
networkMonitor.changed.addListener { [weak self] isOnline in
|
|
270
251
|
guard let self else { return }
|
|
271
252
|
MainActor.assumeIsolated {
|
|
@@ -277,34 +258,28 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
277
258
|
guard let self else { throw CancellationError() }
|
|
278
259
|
return try await resolveGate(request).await().await()
|
|
279
260
|
}
|
|
280
|
-
//
|
|
281
|
-
//
|
|
282
|
-
// old instance may already be gone — "shared was nil" does not mean no
|
|
283
|
-
// controller is subscribed to a dead instance's emitters.
|
|
261
|
+
// Unconditional: `shared` is weak, so after a reload the old instance may be gone while
|
|
262
|
+
// CarPlay is still subscribed to its emitters.
|
|
284
263
|
HybridAudioBrowser.instanceChangedEmitter.emit(())
|
|
285
264
|
}
|
|
286
265
|
forwardBrowserEventsToJS()
|
|
287
266
|
}
|
|
288
267
|
|
|
289
|
-
/// Drops every JS-provided callback that native code can invoke on its own
|
|
290
|
-
/// initiative (browse resolvers, `handleTrackLoad`, `resolveAlbumPath`,
|
|
291
|
-
/// `formatNavigationError`, `resolveGate`, the now-playing formatter).
|
|
292
|
-
///
|
|
293
|
-
/// Called on the previous instance when a new one takes over: invoking a callback of a dead
|
|
294
|
-
/// runtime aborts the process (Nitro throws across a `noexcept` boundary). Native code still
|
|
295
|
-
/// bound to this instance (CarPlay mid-reload) keeps working off the data-only config;
|
|
296
|
-
/// `resolveGate` reverts to its fail-closed default. One-shot: both triggers reach the same
|
|
297
|
-
/// dying instance, and a second strip would re-run the config setter's cascade.
|
|
298
268
|
@MainActor private var didDropJSCallbacks = false
|
|
299
269
|
|
|
270
|
+
/// Drops every JS callback native code can invoke on its own (browse resolvers,
|
|
271
|
+
/// `handleTrackLoad`, `resolveAlbumPath`, `formatNavigationError`, `resolveGate`, the now-playing
|
|
272
|
+
/// formatter): calling into a dead runtime aborts the process (Nitro throws across a `noexcept`
|
|
273
|
+
/// boundary). Native code still bound here (CarPlay mid-reload) keeps the data-only config, and
|
|
274
|
+
/// `resolveGate` reverts to its fail-closed default. One-shot: the reload notification and the
|
|
275
|
+
/// replacement's `init` both reach the dying instance, and a second strip would re-run the
|
|
276
|
+
/// config setter's cascade.
|
|
300
277
|
@MainActor
|
|
301
278
|
private func dropStaleJSCallbacks() {
|
|
302
279
|
guard !didDropJSCallbacks else { return }
|
|
303
280
|
didDropJSCallbacks = true
|
|
304
|
-
//
|
|
305
|
-
//
|
|
306
|
-
// (CarPlay, Siri) blocked on the readiness gate rather than resolve them
|
|
307
|
-
// against an empty config.
|
|
281
|
+
// Assigning `config` marks the browser configured, and a never-configured browser must keep
|
|
282
|
+
// CarPlay and Siri waiting on `playerAndConfiguredBrowser`, not serve them an empty config.
|
|
308
283
|
if browserManager.isConfigured {
|
|
309
284
|
browserManager.config = browserManager.config.strippingJSCallbacks()
|
|
310
285
|
}
|
|
@@ -313,15 +288,15 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
313
288
|
}
|
|
314
289
|
|
|
315
290
|
deinit {
|
|
316
|
-
// Safety net: the AVPlayer must not outlive this instance. `self` can't reach the main
|
|
317
|
-
//
|
|
291
|
+
// Safety net: the AVPlayer must not outlive this instance. `self` can't reach the main actor
|
|
292
|
+
// from here, so the teardown captures what it releases.
|
|
318
293
|
let player = self.player, engine = self.engine
|
|
319
294
|
let tearDown: @Sendable () -> Void = { MainActor.assumeIsolated { Self.destroy(player, engine) } }
|
|
320
295
|
if Thread.isMainThread { tearDown() } else { DispatchQueue.main.async(execute: tearDown) }
|
|
321
296
|
}
|
|
322
297
|
|
|
323
|
-
/// Stops the player and releases its media stack
|
|
324
|
-
/// outlive a dropped reference
|
|
298
|
+
/// Stops the player and releases its media stack; the AVPlayer and the now-playing session
|
|
299
|
+
/// otherwise outlive a dropped reference.
|
|
325
300
|
@MainActor
|
|
326
301
|
func destroyPlayer() {
|
|
327
302
|
Self.destroy(player, engine)
|
|
@@ -333,8 +308,8 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
333
308
|
engine?.destroy()
|
|
334
309
|
}
|
|
335
310
|
|
|
336
|
-
|
|
337
|
-
|
|
311
|
+
// Only the browser's events: the bridge's own events call JS where they are emitted, and their
|
|
312
|
+
// emitters serve native listeners (CarPlay).
|
|
338
313
|
private func forwardBrowserEventsToJS() {
|
|
339
314
|
browserManager.pathChanged.addListener { [weak self] in self?.onPathChanged($0) }
|
|
340
315
|
browserManager.tabsChanged.addListener { [weak self] in self?.onTabsChanged($0) }
|
|
@@ -344,5 +319,5 @@ public class HybridAudioBrowser: HybridAudioBrowserSpec, @unchecked Sendable {
|
|
|
344
319
|
|
|
345
320
|
// MARK: - Autolinking Alias
|
|
346
321
|
|
|
347
|
-
|
|
322
|
+
// Nitro autolinking expects a class named `AudioBrowser`.
|
|
348
323
|
public typealias AudioBrowser = HybridAudioBrowser
|