react-native-audio-browser 0.2.0-next.11 → 0.2.0-next.13
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 +14 -4
- package/android/build.gradle +20 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +115 -26
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +262 -188
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +23 -3
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +267 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +95 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +68 -26
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +60 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +19 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +120 -67
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +21 -24
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +109 -74
- package/android/src/main/java/com/audiobrowser/player/Player.kt +51 -30
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +44 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +108 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +52 -53
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +74 -41
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +229 -50
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +277 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +147 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -53
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +154 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +41 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +161 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/ios/Browser/BrowserConfig.swift +102 -5
- package/ios/Browser/BrowserManager+URLResolution.swift +18 -14
- package/ios/Browser/BrowserManager.swift +229 -180
- package/ios/Browser/BrowserPathHelper.swift +44 -44
- package/ios/Browser/InertStyleDiagnostic.swift +279 -0
- package/ios/Browser/JsonModels.swift +258 -106
- package/ios/Browser/SearchDrillIn.swift +6 -6
- package/ios/Browser/SectionPresentation.swift +64 -0
- package/ios/Browser/SectionScope.swift +58 -24
- package/ios/Browser/StyleResolver.swift +58 -0
- package/ios/Browser/TabBarEntries.swift +9 -3
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CarPlayArtworkResolver.swift +8 -7
- package/ios/CarPlay/CarPlayController.swift +227 -85
- package/ios/CarPlay/CarPlayImageLoader.swift +38 -18
- package/ios/CarPlay/CarPlayListItemFactory.swift +289 -84
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +15 -12
- package/ios/Extension/Capability+RemoteCommand.swift +1 -1
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +11 -15
- package/ios/Extension/Section+Copying.swift +31 -0
- package/ios/Extension/Track+Copying.swift +6 -12
- package/ios/Extension/Track+Identity.swift +18 -0
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Http/HttpClient.swift +8 -2
- package/ios/HybridAudioBrowser.swift +166 -45
- package/ios/Model/NitroTypeStubs.swift +106 -21
- package/ios/Model/PlayerUpdateOptions.swift +7 -0
- package/ios/Player/MediaIntentCriteria.swift +13 -5
- package/ios/Player/MediaLoader.swift +33 -9
- package/ios/Player/NowPlayingUpdater.swift +54 -6
- package/ios/Player/PlaybackCoordinator.swift +13 -6
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/QueueManager.swift +36 -10
- package/ios/Player/RetryManager.swift +4 -3
- package/ios/Player/ShuffleOrder.swift +23 -0
- package/ios/Player/SleepTimerHandling.swift +13 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +53 -18
- package/ios/Tests/BrowserPathHelperTests.swift +50 -20
- package/ios/Tests/CarPlayArtworkResolverTests.swift +24 -41
- package/ios/Tests/InertStyleDiagnosticTests.swift +200 -0
- package/ios/Tests/JsonModelsTests.swift +150 -1
- package/ios/Tests/PlaybackStateStoreTests.swift +4 -3
- package/ios/Tests/QueueManagerTests.swift +72 -6
- package/ios/Tests/RemoteCommandControllerTests.swift +16 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +37 -35
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SectionPresentationTests.swift +90 -0
- package/ios/Tests/SectionScopeTests.swift +87 -55
- package/ios/Tests/StyleResolverTests.swift +127 -0
- package/ios/Tests/Support/TestTypes.swift +7 -0
- package/ios/Tests/TabBarEntriesTests.swift +18 -18
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/TrackPlayer.swift +57 -34
- package/ios/TrackSelector.swift +45 -30
- package/ios/Util/ArtworkImageFetcher.swift +16 -1
- package/ios/Util/NetworkMonitor.swift +43 -26
- package/ios/Util/SFSymbolRenderer.swift +24 -2
- package/ios/Util/SVGProcessor.swift +9 -2
- package/lib/commonjs/AudioBrowser.js +11 -0
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +11 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +2 -2
- package/lib/commonjs/features/favorites.js +13 -10
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +2 -1
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +2 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +3 -1
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +2 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +14 -3
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +11 -4
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +21 -10
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +32 -24
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +144 -87
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +56 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +1 -0
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/features/browser-config.js +11 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +2 -2
- package/lib/module/features/favorites.js +13 -10
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/progress.js +2 -1
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/features/playback/state.js +2 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +3 -1
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +2 -0
- package/lib/module/features/player/validateOptions.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +14 -3
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +11 -4
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +21 -10
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +32 -24
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +144 -87
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +56 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/AudioBrowser.d.ts +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +2 -2
- package/lib/typescript/src/features/favorites.d.ts +13 -10
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +2 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +21 -19
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +1 -8
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +5 -2
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +361 -126
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +33 -53
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +16 -17
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
- package/nitrogen/generated/android/c++/{JFavoritesMatchMode.hpp → JArtworkRendering.hpp} +15 -15
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +8 -3
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +16 -4
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +8 -3
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +8 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +8 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +16 -4
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +2 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +8 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +15 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +8 -2
- package/nitrogen/generated/android/c++/JGridTile.hpp +61 -0
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +33 -14
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +9 -3
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +8 -3
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +22 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +14 -2
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +10 -7
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +2 -5
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +9 -3
- package/nitrogen/generated/android/c++/JOptions.hpp +2 -5
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +8 -3
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -11
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +55 -51
- package/nitrogen/generated/android/c++/JSection.hpp +120 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +96 -0
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTrack.hpp +23 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +8 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +46 -18
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +16 -4
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +24 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +2 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +12 -18
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → Section.kt} +18 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +59 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +6 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +35 -5
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +158 -82
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +25 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +25 -10
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +44 -0
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +5 -5
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +54 -83
- package/nitrogen/generated/ios/swift/Section.swift +100 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +133 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +20 -73
- package/nitrogen/generated/ios/swift/TrackStyle.swift +86 -22
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/GridTile.hpp +80 -0
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +6 -6
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +30 -38
- package/nitrogen/generated/shared/c++/Section.hpp +106 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +126 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +15 -31
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +73 -34
- package/package.json +7 -2
- package/src/AudioBrowser.ts +1 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +11 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +2 -2
- package/src/features/favorites.ts +13 -10
- package/src/features/hook-wiring.test.ts +63 -15
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/progress.ts +2 -1
- package/src/features/playback/rate.ts +8 -1
- package/src/features/playback/state.ts +2 -3
- package/src/features/playback/trackPlaybackTime.ts +1 -1
- package/src/features/player/options.ts +27 -19
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +3 -1
- package/src/features/player/validateOptions.ts +2 -0
- package/src/features/queue/activeTrack.ts +14 -3
- package/src/features/queue/queue.ts +11 -4
- package/src/nitro-stub-drift.test.ts +40 -0
- package/src/public-surface.test.ts +40 -0
- package/src/specs/audio-browser.nitro.ts +4 -3
- package/src/style-resolution.test.ts +210 -0
- package/src/types/browser-native.ts +2 -2
- package/src/types/browser-nodes.ts +377 -135
- package/src/types/browser.ts +34 -55
- package/src/utils/LazyNativeEmitter.ts +20 -10
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.ts +37 -22
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/src/web/browser/BrowserManager.ts +176 -95
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +52 -0
- package/src/web/util/BrowserPathHelper.ts +61 -13
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +135 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +581 -0
- package/website/guide/carplay.md +620 -0
- package/website/guide/configuration.md +173 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +246 -0
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["assertedNotNullish","RequestConfigBuilder","SimpleRouter","BrowserPathHelper","assertBrowsePageShape","parseSearchResponse","BrowserManager","_configuration","router","_layerGeneration","_resolvedLayerGeneration","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","initialPath","tabsRoute","routes","find","r","browseStatic","children","url","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","map","src","contextualUrl","encodeURIComponent","hydrateChildren","transformArtworkForContent","queryTabs","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","resolveArtworkSourceAsync","transformedChildren","Promise","all","artworkSource","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","_layerResolution","generation","promise","cfg","resolvedRequest","requestResolver","request","resolvedBrowse","browseResolver","_resolvedBrowse","catch","err","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","queryParams","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["getTrackIdentity","assertedNotNullish","RequestConfigBuilder","SimpleRouter","BrowserPathHelper","assertBrowsePageShape","parseSearchResponse","flattenSections","flattenedChildren","normalizePage","sectionContaining","BrowserManager","_configuration","router","_layerGeneration","_resolvedLayerGeneration","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","initialPath","tabsRoute","routes","find","r","staticTabs","browseStatic","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","sections","addContextualPaths","hydrateChildren","transformArtworkForContent","queryTabs","index","map","section","children","flatIndex","identity","src","build","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","resolveArtworkSourceAsync","transformTrack","artworkSource","transformedSections","Promise","all","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","_layerResolution","generation","promise","cfg","resolvedRequest","requestResolver","request","resolvedBrowse","browseResolver","_resolvedBrowse","catch","err","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","queryParams","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","expandQueueFromContextualPath","contextualPath","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","rawSections","every","s","tappedIndex","extractIndex","scoped","isQueueable","disabled","playableTracks","tracks","filter","selectedIndex","tappedOffset","tapped","slice","findIndex","singleTrack","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackPath","createSearchPath","searchTracks","t","selectedIdx","isContextual","expanded","firstTab"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { getTrackIdentity } from '../../utils/getTrackIdentity';
|
|
4
|
+
|
|
3
5
|
/**
|
|
4
|
-
* Manages favorite state for tracks
|
|
6
|
+
* Manages favorite state for tracks, keyed by track identity (`id` when set,
|
|
7
|
+
* falling back to `src` — see getTrackIdentity / ADR 0008).
|
|
5
8
|
* Matches Android's favorite hydration behavior.
|
|
6
9
|
*/
|
|
7
10
|
export class FavoriteManager {
|
|
8
11
|
favorites = new Set();
|
|
9
12
|
|
|
10
13
|
/**
|
|
11
|
-
* Sets the favorites cache from an array of track
|
|
14
|
+
* Sets the favorites cache from an array of track identities.
|
|
12
15
|
* This is typically called when favorites are loaded from storage.
|
|
13
16
|
*/
|
|
14
17
|
setFavorites(favorites) {
|
|
@@ -16,24 +19,27 @@ export class FavoriteManager {
|
|
|
16
19
|
}
|
|
17
20
|
|
|
18
21
|
/**
|
|
19
|
-
* Checks if a track is favorited based on its
|
|
22
|
+
* Checks if a track is favorited based on its identity.
|
|
20
23
|
*/
|
|
21
|
-
isFavorited(
|
|
22
|
-
|
|
24
|
+
isFavorited(track) {
|
|
25
|
+
const identity = getTrackIdentity(track);
|
|
26
|
+
return identity !== undefined && this.favorites.has(identity);
|
|
23
27
|
}
|
|
24
28
|
|
|
25
29
|
/**
|
|
26
|
-
* Adds a track
|
|
30
|
+
* Adds a track to the favorites cache under its identity.
|
|
27
31
|
*/
|
|
28
|
-
addFavorite(
|
|
29
|
-
|
|
32
|
+
addFavorite(track) {
|
|
33
|
+
const identity = getTrackIdentity(track);
|
|
34
|
+
if (identity !== undefined) this.favorites.add(identity);
|
|
30
35
|
}
|
|
31
36
|
|
|
32
37
|
/**
|
|
33
|
-
* Removes a track
|
|
38
|
+
* Removes a track from the favorites cache under its identity.
|
|
34
39
|
*/
|
|
35
|
-
removeFavorite(
|
|
36
|
-
|
|
40
|
+
removeFavorite(track) {
|
|
41
|
+
const identity = getTrackIdentity(track);
|
|
42
|
+
if (identity !== undefined) this.favorites.delete(identity);
|
|
37
43
|
}
|
|
38
44
|
|
|
39
45
|
/**
|
|
@@ -47,8 +53,7 @@ export class FavoriteManager {
|
|
|
47
53
|
// Don't overwrite API-provided favorites
|
|
48
54
|
if (track.favorited !== undefined && track.favorited !== null) return track;
|
|
49
55
|
if (this.favorites.size === 0) return track;
|
|
50
|
-
|
|
51
|
-
if (!isFavorited) return track;
|
|
56
|
+
if (!this.isFavorited(track)) return track;
|
|
52
57
|
return {
|
|
53
58
|
...track,
|
|
54
59
|
favorited: true
|
|
@@ -56,19 +61,24 @@ export class FavoriteManager {
|
|
|
56
61
|
}
|
|
57
62
|
|
|
58
63
|
/**
|
|
59
|
-
* Hydrates favorites on all
|
|
60
|
-
* Matches Android's hydrateChildren behavior.
|
|
64
|
+
* Hydrates favorites on all tracks of a resolved page.
|
|
65
|
+
* Matches Android's hydrateChildren behavior. Pages reach hydration
|
|
66
|
+
* normalized (ADR 0010), so `sections` is the only structure to walk.
|
|
61
67
|
*
|
|
62
|
-
* @param resolvedTrack
|
|
63
|
-
* @returns
|
|
68
|
+
* @param resolvedTrack Resolved page to hydrate
|
|
69
|
+
* @returns Resolved page with favorited properties set on its tracks
|
|
64
70
|
*/
|
|
65
71
|
hydrateChildren(resolvedTrack) {
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
72
|
+
const {
|
|
73
|
+
sections
|
|
74
|
+
} = resolvedTrack;
|
|
75
|
+
if (!sections) return resolvedTrack;
|
|
69
76
|
return {
|
|
70
77
|
...resolvedTrack,
|
|
71
|
-
|
|
78
|
+
sections: sections.map(section => ({
|
|
79
|
+
...section,
|
|
80
|
+
children: section.children.map(track => this.hydrateFavorite(track))
|
|
81
|
+
}))
|
|
72
82
|
};
|
|
73
83
|
}
|
|
74
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FavoriteManager","favorites","Set","setFavorites","isFavorited","
|
|
1
|
+
{"version":3,"names":["getTrackIdentity","FavoriteManager","favorites","Set","setFavorites","isFavorited","track","identity","undefined","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","favorited","size","hydrateChildren","resolvedTrack","sections","map","section","children"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,8BAA8B;;AAE/D;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,KAAY,EAAW;IACjC,MAAMC,QAAQ,GAAGP,gBAAgB,CAACM,KAAK,CAAC;IACxC,OAAOC,QAAQ,KAAKC,SAAS,IAAI,IAAI,CAACN,SAAS,CAACO,GAAG,CAACF,QAAQ,CAAC;EAC/D;;EAEA;AACF;AACA;EACEG,WAAWA,CAACJ,KAAY,EAAQ;IAC9B,MAAMC,QAAQ,GAAGP,gBAAgB,CAACM,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKC,SAAS,EAAE,IAAI,CAACN,SAAS,CAACS,GAAG,CAACJ,QAAQ,CAAC;EAC1D;;EAEA;AACF;AACA;EACEK,cAAcA,CAACN,KAAY,EAAQ;IACjC,MAAMC,QAAQ,GAAGP,gBAAgB,CAACM,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKC,SAAS,EAAE,IAAI,CAACN,SAAS,CAACW,MAAM,CAACN,QAAQ,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEO,eAAeA,CAACR,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACS,SAAS,KAAKP,SAAS,IAAIF,KAAK,CAACS,SAAS,KAAK,IAAI,EAAE,OAAOT,KAAK;IAC3E,IAAI,IAAI,CAACJ,SAAS,CAACc,IAAI,KAAK,CAAC,EAAE,OAAOV,KAAK;IAE3C,IAAI,CAAC,IAAI,CAACD,WAAW,CAACC,KAAK,CAAC,EAAE,OAAOA,KAAK;IAE1C,OAAO;MACL,GAAGA,KAAK;MACRS,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAM;MAAEC;IAAS,CAAC,GAAGD,aAAa;IAClC,IAAI,CAACC,QAAQ,EAAE,OAAOD,aAAa;IAEnC,OAAO;MACL,GAAGA,aAAa;MAChBC,QAAQ,EAAEA,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;QACnC,GAAGA,OAAO;QACVC,QAAQ,EAAED,OAAO,CAACC,QAAQ,CAACF,GAAG,CAAEd,KAAK,IAAK,IAAI,CAACQ,eAAe,CAACR,KAAK,CAAC;MACvE,CAAC,CAAC;IACJ,CAAC;EACH;AACF","ignoreList":[]}
|
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
*/
|
|
9
9
|
export function assertBrowsePageShape(response, path) {
|
|
10
10
|
if (Array.isArray(response)) {
|
|
11
|
-
throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, children?: Track[] }. Wrap the rows in a ` +
|
|
11
|
+
throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, sections?: Section[], children?: Track[] }. ` + `Wrap the rows in a \`children\` array (one untitled section) or ` + `group them into \`sections\`.`);
|
|
12
12
|
}
|
|
13
13
|
if (response === null || typeof response !== 'object') {
|
|
14
|
-
throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, children?: Track[] }.`);
|
|
14
|
+
throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, sections?: Section[], ` + `children?: Track[] }.`);
|
|
15
15
|
}
|
|
16
16
|
return response;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,
|
|
1
|
+
{"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,mEAAmE,GACnE,kEAAkE,GAClE,+BACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,wDAAwD,GACxD,uBACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}
|
|
@@ -5,10 +5,10 @@ import { BrowserPathHelper } from '../util/BrowserPathHelper';
|
|
|
5
5
|
/**
|
|
6
6
|
* How a selected track should be navigated, decided purely from its shape:
|
|
7
7
|
* - `contextual` — a playable track carrying its parent queue context in a
|
|
8
|
-
* contextual
|
|
9
|
-
* - `browse` — a browsable track (has a `
|
|
10
|
-
* - `playable` — a bare playable track (`src`, no `
|
|
11
|
-
* - `invalid` — neither `
|
|
8
|
+
* contextual path (`{parentPath}?__trackId={src}`); expand/skip within that queue.
|
|
9
|
+
* - `browse` — a browsable track (has a `path` that isn't contextual); drill in.
|
|
10
|
+
* - `playable` — a bare playable track (`src`, no `path`); load and play it alone.
|
|
11
|
+
* - `invalid` — neither `path` nor `src`; nothing to do.
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
/**
|
|
@@ -17,15 +17,15 @@ import { BrowserPathHelper } from '../util/BrowserPathHelper';
|
|
|
17
17
|
* caller; this only decides which action applies.
|
|
18
18
|
*/
|
|
19
19
|
export function classifyTrackNavigation(track) {
|
|
20
|
-
const
|
|
21
|
-
if (
|
|
20
|
+
const path = track.path;
|
|
21
|
+
if (path && BrowserPathHelper.isContextual(path)) {
|
|
22
22
|
return {
|
|
23
23
|
kind: 'contextual',
|
|
24
|
-
parentPath: BrowserPathHelper.stripTrackId(
|
|
25
|
-
trackId: BrowserPathHelper.extractTrackId(
|
|
24
|
+
parentPath: BrowserPathHelper.stripTrackId(path),
|
|
25
|
+
trackId: BrowserPathHelper.extractTrackId(path)
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
if (
|
|
28
|
+
if (path) return {
|
|
29
29
|
kind: 'browse'
|
|
30
30
|
};
|
|
31
31
|
if (track.src) return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BrowserPathHelper","classifyTrackNavigation","track","
|
|
1
|
+
{"version":3,"names":["BrowserPathHelper","classifyTrackNavigation","track","path","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;AACA,SAASA,iBAAiB,QAAQ,2BAA2B;;AAE7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,IAAI,GAAGD,KAAK,CAACC,IAAI;EACvB,IAAIA,IAAI,IAAIH,iBAAiB,CAACI,YAAY,CAACD,IAAI,CAAC,EAAE;IAChD,OAAO;MACLE,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEN,iBAAiB,CAACO,YAAY,CAACJ,IAAI,CAAC;MAChDK,OAAO,EAAER,iBAAiB,CAACS,cAAc,CAACN,IAAI;IAChD,CAAC;EACH;EACA,IAAIA,IAAI,EAAE,OAAO;IAAEE,IAAI,EAAE;EAAS,CAAC;EACnC,IAAIH,KAAK,CAACQ,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { getTrackIdentity } from '../../utils/getTrackIdentity';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Normalizes a resolved page to the canonical sectioned shape (ADR 0010):
|
|
7
|
+
* `sections` wins when present; plain `children` is authoring sugar for one
|
|
8
|
+
* untitled section. The output never carries `children` — there is exactly
|
|
9
|
+
* one structure downstream code hydrates, transforms, and scopes against.
|
|
10
|
+
*/
|
|
11
|
+
export function normalizePage(content) {
|
|
12
|
+
const {
|
|
13
|
+
children,
|
|
14
|
+
sections,
|
|
15
|
+
...rest
|
|
16
|
+
} = content;
|
|
17
|
+
const normalized = sections ?? (children !== undefined ? [{
|
|
18
|
+
children
|
|
19
|
+
}] : undefined);
|
|
20
|
+
return {
|
|
21
|
+
...rest,
|
|
22
|
+
sections: normalized
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* The page's children concatenated in section order — the flattening that
|
|
28
|
+
* defines the contextual `__index` positions (ADR 0009/0010) and the flat
|
|
29
|
+
* views (tabs, search) of a sectioned page.
|
|
30
|
+
*/
|
|
31
|
+
export function flattenSections(sections) {
|
|
32
|
+
return sections?.flatMap(section => section.children) ?? [];
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* The page's tracks as one flat list, normalizing first — the flat view
|
|
37
|
+
* (tabs, search) of a page in either authored shape. Mirrors the native
|
|
38
|
+
* `flattenedChildren` accessors.
|
|
39
|
+
*/
|
|
40
|
+
export function flattenedChildren(page) {
|
|
41
|
+
return flattenSections(normalizePage(page).sections);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* The section of the page containing the playable `trackId` (a track
|
|
46
|
+
* identity: id when non-blank, else src), or undefined when not found.
|
|
47
|
+
*
|
|
48
|
+
* `tappedIndex` — the flat page position stamped into the contextual URL —
|
|
49
|
+
* is a tie-breaker, never an identifier: when the child at that position
|
|
50
|
+
* still carries the tapped identity, it pins which section (and which copy,
|
|
51
|
+
* via `tappedOffset`) was tapped; when it doesn't (the list shifted),
|
|
52
|
+
* resolution falls back to the first section containing the identity. A
|
|
53
|
+
* stale index can therefore never select a different track — at worst a
|
|
54
|
+
* different copy of the same one.
|
|
55
|
+
*/
|
|
56
|
+
export function sectionContaining(sections, trackId, tappedIndex) {
|
|
57
|
+
if (tappedIndex !== undefined && tappedIndex >= 0) {
|
|
58
|
+
let start = 0;
|
|
59
|
+
for (const section of sections) {
|
|
60
|
+
const offset = tappedIndex - start;
|
|
61
|
+
if (offset < section.children.length) {
|
|
62
|
+
const tapped = section.children[offset];
|
|
63
|
+
if (tapped && getTrackIdentity(tapped) === trackId) {
|
|
64
|
+
return {
|
|
65
|
+
tracks: section.children,
|
|
66
|
+
tappedOffset: offset
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
start += section.children.length;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
for (const section of sections) {
|
|
75
|
+
if (section.children.some(track => getTrackIdentity(track) === trackId)) {
|
|
76
|
+
return {
|
|
77
|
+
tracks: section.children
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return undefined;
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=sections.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["getTrackIdentity","normalizePage","content","children","sections","rest","normalized","undefined","flattenSections","flatMap","section","flattenedChildren","page","sectionContaining","trackId","tappedIndex","start","offset","length","tapped","tracks","tappedOffset","some","track"],"sourceRoot":"../../../../src","sources":["web/browser/sections.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,8BAA8B;;AAE/D;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,aAAaA,CAACC,OAAsB,EAAiB;EACnE,MAAM;IAAEC,QAAQ;IAAEC,QAAQ;IAAE,GAAGC;EAAK,CAAC,GAAGH,OAAO;EAC/C,MAAMI,UAAU,GACdF,QAAQ,KAAKD,QAAQ,KAAKI,SAAS,GAAG,CAAC;IAAEJ;EAAS,CAAC,CAAC,GAAGI,SAAS,CAAC;EACnE,OAAO;IAAE,GAAGF,IAAI;IAAED,QAAQ,EAAEE;EAAW,CAAC;AAC1C;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,eAAeA,CAACJ,QAA+B,EAAW;EACxE,OAAOA,QAAQ,EAAEK,OAAO,CAAEC,OAAO,IAAKA,OAAO,CAACP,QAAQ,CAAC,IAAI,EAAE;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASQ,iBAAiBA,CAACC,IAAmB,EAAW;EAC9D,OAAOJ,eAAe,CAACP,aAAa,CAACW,IAAI,CAAC,CAACR,QAAQ,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,iBAAiBA,CAC/BT,QAAmB,EACnBU,OAAe,EACfC,WAA+B,EACyB;EACxD,IAAIA,WAAW,KAAKR,SAAS,IAAIQ,WAAW,IAAI,CAAC,EAAE;IACjD,IAAIC,KAAK,GAAG,CAAC;IACb,KAAK,MAAMN,OAAO,IAAIN,QAAQ,EAAE;MAC9B,MAAMa,MAAM,GAAGF,WAAW,GAAGC,KAAK;MAClC,IAAIC,MAAM,GAAGP,OAAO,CAACP,QAAQ,CAACe,MAAM,EAAE;QACpC,MAAMC,MAAM,GAAGT,OAAO,CAACP,QAAQ,CAACc,MAAM,CAAC;QACvC,IAAIE,MAAM,IAAInB,gBAAgB,CAACmB,MAAM,CAAC,KAAKL,OAAO,EAAE;UAClD,OAAO;YAAEM,MAAM,EAAEV,OAAO,CAACP,QAAQ;YAAEkB,YAAY,EAAEJ;UAAO,CAAC;QAC3D;QACA;MACF;MACAD,KAAK,IAAIN,OAAO,CAACP,QAAQ,CAACe,MAAM;IAClC;EACF;EACA,KAAK,MAAMR,OAAO,IAAIN,QAAQ,EAAE;IAC9B,IAAIM,OAAO,CAACP,QAAQ,CAACmB,IAAI,CAAEC,KAAK,IAAKvB,gBAAgB,CAACuB,KAAK,CAAC,KAAKT,OAAO,CAAC,EAAE;MACzE,OAAO;QAAEM,MAAM,EAAEV,OAAO,CAACP;MAAS,CAAC;IACrC;EACF;EACA,OAAOI,SAAS;AAClB","ignoreList":[]}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { artworkUrl } from '../../utils/artwork';
|
|
4
|
+
import { getTrackIdentity } from '../../utils/getTrackIdentity';
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Manages now playing metadata overrides.
|
|
@@ -28,7 +29,7 @@ export class NowPlayingManager {
|
|
|
28
29
|
album: update.album ?? currentTrack.album,
|
|
29
30
|
artwork: artworkUrl(currentTrack.artwork),
|
|
30
31
|
description: currentTrack.description,
|
|
31
|
-
mediaId: currentTrack
|
|
32
|
+
mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
|
|
32
33
|
genre: currentTrack.genre,
|
|
33
34
|
duration
|
|
34
35
|
} : {
|
|
@@ -37,7 +38,7 @@ export class NowPlayingManager {
|
|
|
37
38
|
album: currentTrack.album,
|
|
38
39
|
artwork: artworkUrl(currentTrack.artwork),
|
|
39
40
|
description: currentTrack.description,
|
|
40
|
-
mediaId: currentTrack
|
|
41
|
+
mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
|
|
41
42
|
genre: currentTrack.genre,
|
|
42
43
|
duration
|
|
43
44
|
};
|
|
@@ -59,7 +60,7 @@ export class NowPlayingManager {
|
|
|
59
60
|
album: this.override?.album ?? currentTrack.album,
|
|
60
61
|
artwork: artworkUrl(currentTrack.artwork),
|
|
61
62
|
description: currentTrack.description,
|
|
62
|
-
mediaId: currentTrack
|
|
63
|
+
mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
|
|
63
64
|
genre: currentTrack.genre,
|
|
64
65
|
duration
|
|
65
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["artworkUrl","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","description","mediaId","
|
|
1
|
+
{"version":3,"names":["artworkUrl","getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","description","mediaId","path","genre","getNowPlaying","undefined","clearNowPlayingOverride"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;AAEA,SAASA,UAAU,QAAQ,qBAAqB;AAChD,SAASC,gBAAgB,QAAQ,8BAA8B;;AAE/D;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,CAAC;EAG7B;EACAC,mBAAmB,GAA2CA,CAAA,KAAM,CAAC,CAAC;;EAEtE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgBA,CACdC,MAAoC,EACpCC,YAA+B,EAC/BC,QAAgB,EACV;IACN,IAAI,CAACC,QAAQ,GAAGH,MAAM;IAEtB,IAAI,CAACC,YAAY,EAAE;IAEnB,MAAMG,QAA4B,GAAGJ,MAAM,GACvC;MACEK,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACzCC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAIL,YAAY,CAACK,MAAM;MAC5CC,KAAK,EAAEP,MAAM,CAACO,KAAK,IAAIN,YAAY,CAACM,KAAK;MACzCC,OAAO,EAAEb,UAAU,CAACM,YAAY,CAACO,OAAO,CAAC;MACzCC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAEd,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACU,IAAI;MAC5DC,KAAK,EAAEX,YAAY,CAACW,KAAK;MACzBV;IACF,CAAC,GACD;MACEG,KAAK,EAAEJ,YAAY,CAACI,KAAK;MACzBC,MAAM,EAAEL,YAAY,CAACK,MAAM;MAC3BC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAEb,UAAU,CAACM,YAAY,CAACO,OAAO,CAAC;MACzCC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAEd,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACU,IAAI;MAC5DC,KAAK,EAAEX,YAAY,CAACW,KAAK;MACzBV;IACF,CAAC;IAEL,IAAI,CAACJ,mBAAmB,CAACM,QAAQ,CAAC;EACpC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACES,aAAaA,CACXZ,YAA+B,EAC/BC,QAAgB,EACgB;IAChC,IAAI,CAACD,YAAY,EAAE,OAAOa,SAAS;IAEnC,OAAO;MACLT,KAAK,EAAE,IAAI,CAACF,QAAQ,EAAEE,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACjDC,MAAM,EAAE,IAAI,CAACH,QAAQ,EAAEG,MAAM,IAAIL,YAAY,CAACK,MAAM;MACpDC,KAAK,EAAE,IAAI,CAACJ,QAAQ,EAAEI,KAAK,IAAIN,YAAY,CAACM,KAAK;MACjDC,OAAO,EAAEb,UAAU,CAACM,YAAY,CAACO,OAAO,CAAC;MACzCC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAEd,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACU,IAAI;MAC5DC,KAAK,EAAEX,YAAY,CAACW,KAAK;MACzBV;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEa,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAACZ,QAAQ,GAAGW,SAAS;EAC3B;AACF","ignoreList":[]}
|
|
@@ -8,8 +8,12 @@
|
|
|
8
8
|
* 1. System paths (prefixed with `/__`): Root, recent, and search paths
|
|
9
9
|
* 2. Contextual URLs: Embed parent context in track identifiers for Media3 integration
|
|
10
10
|
*
|
|
11
|
-
* Contextual URL format: `{parentPath}?__trackId={
|
|
12
|
-
* Example: "/library/radio?__trackId=song.mp3"
|
|
11
|
+
* Contextual URL format: `{parentPath}?__trackId={trackIdentity}&__index={childIndex}`
|
|
12
|
+
* Example: "/library/radio?__trackId=song.mp3&__index=2"
|
|
13
|
+
*
|
|
14
|
+
* `__trackId` is the identity check; `__index` (the child's position on the
|
|
15
|
+
* page at stamp time) is only a tie-breaker between surfaces that carry the
|
|
16
|
+
* same identity — a stale index never selects a different track.
|
|
13
17
|
*
|
|
14
18
|
* This allows:
|
|
15
19
|
* - Media3 to reference playable-only tracks (tracks with `src` but no `url`)
|
|
@@ -21,6 +25,8 @@ export const BrowserPathHelper = {
|
|
|
21
25
|
SEARCH_PATH_PREFIX: '/__search',
|
|
22
26
|
/** Query parameter name for contextual track identifiers */
|
|
23
27
|
CONTEXTUAL_TRACK_PARAM: '__trackId',
|
|
28
|
+
/** Query parameter name for the tapped child's page position (tie-breaker) */
|
|
29
|
+
CONTEXTUAL_INDEX_PARAM: '__index',
|
|
24
30
|
/**
|
|
25
31
|
* Create a search path for a given query
|
|
26
32
|
*/
|
|
@@ -38,13 +44,13 @@ export const BrowserPathHelper = {
|
|
|
38
44
|
return path.includes(`?${this.CONTEXTUAL_TRACK_PARAM}=`) || path.includes(`&${this.CONTEXTUAL_TRACK_PARAM}=`);
|
|
39
45
|
},
|
|
40
46
|
/**
|
|
41
|
-
* Strips the __trackId
|
|
42
|
-
* If the URL is not contextual, returns it unchanged.
|
|
47
|
+
* Strips the contextual parameters (__trackId and __index) from a contextual
|
|
48
|
+
* URL to get the parent path. If the URL is not contextual, returns it unchanged.
|
|
43
49
|
*
|
|
44
50
|
* @param url The URL to process
|
|
45
|
-
* @returns The URL without the
|
|
51
|
+
* @returns The URL without the contextual parameters
|
|
46
52
|
*
|
|
47
|
-
* Example: "/library/radio?__trackId=song.mp3" → "/library/radio"
|
|
53
|
+
* Example: "/library/radio?__trackId=song.mp3&__index=2" → "/library/radio"
|
|
48
54
|
* Example: "/search?q=jazz&__trackId=song.mp3" → "/search?q=jazz"
|
|
49
55
|
*/
|
|
50
56
|
stripTrackId(url) {
|
|
@@ -56,8 +62,9 @@ export const BrowserPathHelper = {
|
|
|
56
62
|
const isFullUrl = url.startsWith('http://') || url.startsWith('https://');
|
|
57
63
|
const urlObj = new URL(url, isFullUrl ? undefined : 'http://placeholder');
|
|
58
64
|
|
|
59
|
-
// Remove the
|
|
65
|
+
// Remove the contextual parameters
|
|
60
66
|
urlObj.searchParams.delete(this.CONTEXTUAL_TRACK_PARAM);
|
|
67
|
+
urlObj.searchParams.delete(this.CONTEXTUAL_INDEX_PARAM);
|
|
61
68
|
|
|
62
69
|
// Return the appropriate format
|
|
63
70
|
if (isFullUrl) {
|
|
@@ -68,7 +75,7 @@ export const BrowserPathHelper = {
|
|
|
68
75
|
}
|
|
69
76
|
} catch {
|
|
70
77
|
// Fallback: simple string manipulation
|
|
71
|
-
const paramPattern = new RegExp(`[?&]
|
|
78
|
+
const paramPattern = new RegExp(`[?&](?:${this.CONTEXTUAL_TRACK_PARAM}|${this.CONTEXTUAL_INDEX_PARAM})=[^&]*`, 'g');
|
|
72
79
|
let result = url.replace(paramPattern, '');
|
|
73
80
|
// Clean up any trailing ? or &
|
|
74
81
|
result = result.replace(/[?&]$/, '');
|
|
@@ -77,6 +84,22 @@ export const BrowserPathHelper = {
|
|
|
77
84
|
return result;
|
|
78
85
|
}
|
|
79
86
|
},
|
|
87
|
+
/**
|
|
88
|
+
* Builds a contextual URL by appending a track identifier — and optionally
|
|
89
|
+
* the tapped child's page position — to a parent path.
|
|
90
|
+
*
|
|
91
|
+
* @param parentPath The parent container path
|
|
92
|
+
* @param trackId The track identity (`id` when non-blank, else `src`)
|
|
93
|
+
* @param index The child's position on the page at stamp time (tie-breaker)
|
|
94
|
+
* @returns A contextual URL combining parent path, track ID, and index
|
|
95
|
+
*
|
|
96
|
+
* Example: build("/library", "song.mp3", 2) → "/library?__trackId=song.mp3&__index=2"
|
|
97
|
+
*/
|
|
98
|
+
build(parentPath, trackId, index) {
|
|
99
|
+
const separator = parentPath.includes('?') ? '&' : '?';
|
|
100
|
+
const indexParam = index === undefined ? '' : `&${this.CONTEXTUAL_INDEX_PARAM}=${index}`;
|
|
101
|
+
return `${parentPath}${separator}${this.CONTEXTUAL_TRACK_PARAM}=${encodeURIComponent(trackId)}${indexParam}`;
|
|
102
|
+
},
|
|
80
103
|
/**
|
|
81
104
|
* Extracts the track ID from a contextual URL.
|
|
82
105
|
* Returns undefined if the URL is not contextual or doesn't contain the track ID parameter.
|
|
@@ -90,14 +113,36 @@ export const BrowserPathHelper = {
|
|
|
90
113
|
if (!this.isContextual(path)) {
|
|
91
114
|
return undefined;
|
|
92
115
|
}
|
|
116
|
+
return this.extractParam(path, this.CONTEXTUAL_TRACK_PARAM);
|
|
117
|
+
},
|
|
118
|
+
/**
|
|
119
|
+
* Extracts the stamped page index from a contextual URL, or undefined when
|
|
120
|
+
* the URL is not contextual or carries no (valid, non-negative) index.
|
|
121
|
+
*
|
|
122
|
+
* Example: "/library/radio?__trackId=song.mp3&__index=2" → 2
|
|
123
|
+
*/
|
|
124
|
+
extractIndex(path) {
|
|
125
|
+
if (!this.isContextual(path)) {
|
|
126
|
+
return undefined;
|
|
127
|
+
}
|
|
128
|
+
const raw = this.extractParam(path, this.CONTEXTUAL_INDEX_PARAM);
|
|
129
|
+
if (raw === undefined || !/^\d+$/.test(raw)) {
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
return Number.parseInt(raw, 10);
|
|
133
|
+
},
|
|
134
|
+
/**
|
|
135
|
+
* Extracts a single query parameter, handling both full URLs and paths,
|
|
136
|
+
* with a regex fallback for input the URL parser rejects.
|
|
137
|
+
*/
|
|
138
|
+
extractParam(path, param) {
|
|
93
139
|
try {
|
|
94
|
-
// Parse the URL - handle both full URLs and paths
|
|
95
140
|
const isFullUrl = path.startsWith('http://') || path.startsWith('https://');
|
|
96
141
|
const urlObj = new URL(path, isFullUrl ? undefined : 'http://placeholder');
|
|
97
|
-
return urlObj.searchParams.get(
|
|
142
|
+
return urlObj.searchParams.get(param) ?? undefined;
|
|
98
143
|
} catch {
|
|
99
144
|
// Fallback: regex extraction
|
|
100
|
-
const match = path.match(new RegExp(`[?&]${
|
|
145
|
+
const match = path.match(new RegExp(`[?&]${param}=([^&]*)`));
|
|
101
146
|
return match?.[1] ? decodeURIComponent(match[1]) : undefined;
|
|
102
147
|
}
|
|
103
148
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BrowserPathHelper","SEARCH_PATH_PREFIX","CONTEXTUAL_TRACK_PARAM","createSearchPath","query","encodedQuery","encodeURIComponent","isContextual","path","includes","stripTrackId","url","isFullUrl","startsWith","urlObj","URL","undefined","searchParams","delete","toString","search","pathname","paramPattern","RegExp","result","replace","extractTrackId","get","match","decodeURIComponent","buildUrl","baseUrl","normalizedBase","normalizedPath"],"sourceRoot":"../../../../src","sources":["web/util/BrowserPathHelper.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,iBAAiB,GAAG;EAC/B;EACAC,kBAAkB,EAAE,WAAW;EAE/B;EACAC,sBAAsB,EAAE,WAAW;EAEnC;AACF;AACA;EACEC,gBAAgBA,CAACC,KAAa,EAAU;IACtC,MAAMC,YAAY,GAAGC,kBAAkB,CAACF,KAAK,CAAC;IAC9C,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"names":["BrowserPathHelper","SEARCH_PATH_PREFIX","CONTEXTUAL_TRACK_PARAM","CONTEXTUAL_INDEX_PARAM","createSearchPath","query","encodedQuery","encodeURIComponent","isContextual","path","includes","stripTrackId","url","isFullUrl","startsWith","urlObj","URL","undefined","searchParams","delete","toString","search","pathname","paramPattern","RegExp","result","replace","build","parentPath","trackId","index","separator","indexParam","extractTrackId","extractParam","extractIndex","raw","test","Number","parseInt","param","get","match","decodeURIComponent","buildUrl","baseUrl","normalizedBase","normalizedPath"],"sourceRoot":"../../../../src","sources":["web/util/BrowserPathHelper.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AudioBrowser.d.ts","sourceRoot":"","sources":["../../../src/AudioBrowser.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,kBAAkB,CAAA"}
|
|
1
|
+
{"version":3,"file":"AudioBrowser.d.ts","sourceRoot":"","sources":["../../../src/AudioBrowser.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-config.d.ts","sourceRoot":"","sources":["../../../../src/features/browser-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAWrB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EACV,0BAA0B,EAE3B,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"browser-config.d.ts","sourceRoot":"","sources":["../../../../src/features/browser-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAWrB,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EACV,0BAA0B,EAE3B,MAAM,yBAAyB,CAAA;AA2KhC,eAAO,MAAM,iBAAiB,eAAe,CAAA;AAqC7C;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,oBAAoB,GAC3B,IAAI,CAuCN;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,oBAAoB,GAC3B,0BAA0B,CAoB5B"}
|
|
@@ -33,8 +33,8 @@ import { NativeUpdatedValue } from '../utils/NativeUpdatedValue';
|
|
|
33
33
|
* }
|
|
34
34
|
* },
|
|
35
35
|
* tabs: [
|
|
36
|
-
* { title: 'Home',
|
|
37
|
-
* { title: 'Search',
|
|
36
|
+
* { title: 'Home', path: '/' },
|
|
37
|
+
* { title: 'Search', path: '/search' }
|
|
38
38
|
* ]
|
|
39
39
|
* })
|
|
40
40
|
* ```
|