react-native-audio-browser 1.0.0-next.5 → 1.0.0-next.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +3 -2
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Player/Player.swift +4 -2
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/PlayerPolicyTests.swift +19 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/RequestLayerTests.swift +5 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/Support/TestTypes.swift +14 -0
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.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/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +55 -8
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/gate.md +1 -1
|
@@ -5,10 +5,10 @@ import { assertedNotNullish } from '../../utils/validation';
|
|
|
5
5
|
import { RequestConfigBuilder } from '../http/RequestConfigBuilder';
|
|
6
6
|
import { SimpleRouter } from '../SimpleRouter';
|
|
7
7
|
import { BrowserPathHelper } from '../util/BrowserPathHelper';
|
|
8
|
+
import { GenerationMemo } from '../util/GenerationMemo';
|
|
8
9
|
import { assertBrowsePageShape } from './assertBrowsePageShape';
|
|
9
10
|
import { parseSearchResponse } from './parseSearchResponse';
|
|
10
11
|
import { flattenSections, flattenedChildren, normalizePage, sectionContaining } from './sections';
|
|
11
|
-
|
|
12
12
|
/**
|
|
13
13
|
* Manages browser navigation, route resolution, and content loading.
|
|
14
14
|
* Coordinates between HTTP client, favorite manager, and error manager.
|
|
@@ -18,16 +18,10 @@ export class BrowserManager {
|
|
|
18
18
|
_configuration = {};
|
|
19
19
|
router = new SimpleRouter();
|
|
20
20
|
|
|
21
|
-
//
|
|
22
|
-
//
|
|
23
|
-
// and
|
|
24
|
-
|
|
25
|
-
_layerGeneration = 0;
|
|
26
|
-
_resolvedLayerGeneration = -1;
|
|
27
|
-
|
|
28
|
-
// Dedupes concurrent resolution within a generation (config-set triggers an
|
|
29
|
-
// initial navigate that can overlap with an explicit navigatePath), so a
|
|
30
|
-
// resolver is invoked exactly once per generation even under concurrency.
|
|
21
|
+
// The request and browse layers: each resolver's result, else the static
|
|
22
|
+
// layer, for the current content generation. The generation bumps on
|
|
23
|
+
// config-set and on invalidateAllContent().
|
|
24
|
+
layers = new GenerationMemo();
|
|
31
25
|
|
|
32
26
|
// Navigation tracking to prevent race conditions (matches Android's @Volatile currentNavigationId)
|
|
33
27
|
currentNavigationId = 0;
|
|
@@ -118,7 +112,7 @@ export class BrowserManager {
|
|
|
118
112
|
*/
|
|
119
113
|
set configuration(value) {
|
|
120
114
|
this._configuration = value;
|
|
121
|
-
this.
|
|
115
|
+
this.layers.invalidate();
|
|
122
116
|
this.navigationErrorManager.clearNavigationError();
|
|
123
117
|
this.navigationErrorManager.setFormatCallback(value.formatNavigationError);
|
|
124
118
|
|
|
@@ -173,7 +167,7 @@ export class BrowserManager {
|
|
|
173
167
|
* to re-resolve it.
|
|
174
168
|
*/
|
|
175
169
|
invalidateAllContent() {
|
|
176
|
-
this.
|
|
170
|
+
this.layers.invalidate();
|
|
177
171
|
if (this._path) {
|
|
178
172
|
void this.navigate(this._path);
|
|
179
173
|
}
|
|
@@ -351,18 +345,12 @@ export class BrowserManager {
|
|
|
351
345
|
// meant an app with no `artwork` block never populated the field at all —
|
|
352
346
|
// `resolveArtworkSourceAsync` already handles the no-config case the way
|
|
353
347
|
// `resolveArtworkUrl` does on Android.
|
|
354
|
-
const artworkConfig = this._configuration.artwork;
|
|
355
|
-
// The shared request layer applies to artwork too — use the resolved layer
|
|
356
|
-
// (resolver result or static config) so a resolver-only config still works.
|
|
357
|
-
await this.ensureLayersResolved();
|
|
358
|
-
const requestConfig = this._resolvedRequest;
|
|
359
|
-
|
|
360
348
|
// Transform parent artwork
|
|
361
|
-
const parentArtworkSource = await
|
|
349
|
+
const parentArtworkSource = await this.resolveArtworkSource(content);
|
|
362
350
|
|
|
363
351
|
// Transform children artwork, section by section
|
|
364
352
|
const transformTrack = async track => {
|
|
365
|
-
const artworkSource = await
|
|
353
|
+
const artworkSource = await this.resolveArtworkSource(track);
|
|
366
354
|
if (artworkSource && !track.artworkSource) {
|
|
367
355
|
return {
|
|
368
356
|
...track,
|
|
@@ -443,47 +431,32 @@ export class BrowserManager {
|
|
|
443
431
|
* `BrowserManager.resolvedRequestConfig()`, which carries the same warning.
|
|
444
432
|
*/
|
|
445
433
|
async resolvedRequestConfig() {
|
|
446
|
-
await this.
|
|
447
|
-
return this._resolvedRequest;
|
|
434
|
+
return (await this.resolvedLayers()).request;
|
|
448
435
|
}
|
|
449
436
|
|
|
450
437
|
/**
|
|
451
|
-
*
|
|
452
|
-
*
|
|
453
|
-
* result cached; a static config (no resolver) passes through unchanged.
|
|
438
|
+
* `track`'s artwork through the resolved request layer and `artworkConfig`,
|
|
439
|
+
* else the `artwork` config. Rejects when the request layer's resolver does.
|
|
454
440
|
*/
|
|
455
|
-
async
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
441
|
+
async resolveArtworkSource(track, imageContext, artworkConfig = this._configuration.artwork) {
|
|
442
|
+
return RequestConfigBuilder.resolveArtworkSourceAsync(track, await this.resolvedRequestConfig(), artworkConfig, imageContext);
|
|
443
|
+
}
|
|
444
|
+
|
|
445
|
+
/**
|
|
446
|
+
* The request and browse layers of the current generation. A resolver runs
|
|
447
|
+
* once per generation, and again for a later caller when it outlasts
|
|
448
|
+
* {@link GenerationMemo}'s bound.
|
|
449
|
+
*/
|
|
450
|
+
resolvedLayers() {
|
|
451
|
+
return this.layers.value(async () => {
|
|
465
452
|
const cfg = this._configuration;
|
|
466
|
-
const
|
|
467
|
-
const
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
this._resolvedLayerGeneration = generation;
|
|
473
|
-
}
|
|
474
|
-
})().catch(err => {
|
|
475
|
-
// A failed resolution must not wedge the generation — clear the in-flight
|
|
476
|
-
// cache so the next navigation retries (e.g. a transient async resolver error).
|
|
477
|
-
if (this._layerResolution?.generation === generation) {
|
|
478
|
-
this._layerResolution = undefined;
|
|
479
|
-
}
|
|
480
|
-
throw err;
|
|
453
|
+
const request = cfg.requestResolver ? await cfg.requestResolver() : cfg.request;
|
|
454
|
+
const browse = cfg.browseResolver ? await cfg.browseResolver() : cfg.browse;
|
|
455
|
+
return {
|
|
456
|
+
request,
|
|
457
|
+
browse
|
|
458
|
+
};
|
|
481
459
|
});
|
|
482
|
-
this._layerResolution = {
|
|
483
|
-
generation,
|
|
484
|
-
promise
|
|
485
|
-
};
|
|
486
|
-
return promise;
|
|
487
460
|
}
|
|
488
461
|
|
|
489
462
|
/**
|
|
@@ -496,12 +469,12 @@ export class BrowserManager {
|
|
|
496
469
|
* Mirrors native's BrowserManager.resolveFromConfig.
|
|
497
470
|
*/
|
|
498
471
|
async resolveFromConfig(kindConfig, routeConfig, path, params) {
|
|
499
|
-
await this.
|
|
472
|
+
const layers = await this.resolvedLayers();
|
|
500
473
|
const merged = await RequestConfigBuilder.applyLayers({
|
|
501
474
|
path
|
|
502
|
-
}, [
|
|
475
|
+
}, [layers.request,
|
|
503
476
|
// fall back to the route's kind config when no browse layer is configured
|
|
504
|
-
|
|
477
|
+
layers.browse ?? kindConfig, routeConfig], params);
|
|
505
478
|
const response = await this.httpClient.executeRequest(merged);
|
|
506
479
|
return assertBrowsePageShape(response, path);
|
|
507
480
|
}
|
|
@@ -515,11 +488,13 @@ export class BrowserManager {
|
|
|
515
488
|
* isn't duplicated. Errors propagate to the caller.
|
|
516
489
|
*/
|
|
517
490
|
async fetchSearchResults(searchConfig, queryParams) {
|
|
518
|
-
|
|
491
|
+
const {
|
|
492
|
+
request
|
|
493
|
+
} = await this.resolvedLayers();
|
|
519
494
|
const merged = await RequestConfigBuilder.applyLayers({
|
|
520
495
|
path: searchConfig.path,
|
|
521
496
|
query: queryParams
|
|
522
|
-
}, [
|
|
497
|
+
}, [request, searchConfig], queryParams);
|
|
523
498
|
const response = await this.httpClient.executeRequest(merged);
|
|
524
499
|
return parseSearchResponse(response);
|
|
525
500
|
}
|
|
@@ -597,12 +572,8 @@ export class BrowserManager {
|
|
|
597
572
|
// request layer (incl. its transform) applies, matching content/search.
|
|
598
573
|
// Gated per track inside the resolver, as on Android — see
|
|
599
574
|
// `transformArtworkForContent`.
|
|
600
|
-
const artworkConfig = this._configuration.artwork;
|
|
601
|
-
// Resolved request layer (resolver or static), matching content/search.
|
|
602
|
-
await this.ensureLayersResolved();
|
|
603
|
-
const requestConfig = this._resolvedRequest;
|
|
604
575
|
return Promise.all(tabs.map(async track => {
|
|
605
|
-
const artworkSource = await
|
|
576
|
+
const artworkSource = await this.resolveArtworkSource(track);
|
|
606
577
|
if (artworkSource && !track.artworkSource) {
|
|
607
578
|
return {
|
|
608
579
|
...track,
|
|
@@ -1 +1 @@
|
|
|
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","resolvedRequestConfig","_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
|
+
{"version":3,"names":["getTrackIdentity","assertedNotNullish","RequestConfigBuilder","SimpleRouter","BrowserPathHelper","GenerationMemo","assertBrowsePageShape","parseSearchResponse","flattenSections","flattenedChildren","normalizePage","sectionContaining","BrowserManager","_configuration","router","layers","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","invalidate","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","parentArtworkSource","resolveArtworkSource","transformTrack","artworkSource","transformedSections","Promise","all","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","resolvedRequestConfig","resolvedLayers","request","imageContext","artworkConfig","artwork","resolveArtworkSourceAsync","cfg","requestResolver","browseResolver","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,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { RequestConfigBuilder } from '../http/RequestConfigBuilder';
|
|
4
|
-
|
|
5
3
|
/**
|
|
6
4
|
* Manages search functionality.
|
|
7
5
|
* Resolves search queries using configured __search__ route.
|
|
@@ -55,10 +53,8 @@ export class SearchManager {
|
|
|
55
53
|
// Transform artwork URLs on search results using async method with full Track access
|
|
56
54
|
// Gated per track inside the resolver, as on Android — a result carrying a
|
|
57
55
|
// plain `artwork` URL resolves even with no `artwork` config.
|
|
58
|
-
const requestConfig = await this.browserManager.resolvedRequestConfig();
|
|
59
|
-
const artworkConfig = this.browserManager.configuration.artwork;
|
|
60
56
|
results = await Promise.all(results.map(async track => {
|
|
61
|
-
const artworkSource = await
|
|
57
|
+
const artworkSource = await this.browserManager.resolveArtworkSource(track);
|
|
62
58
|
if (artworkSource && !track.artworkSource) {
|
|
63
59
|
return {
|
|
64
60
|
...track,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["SearchManager","constructor","browserManager","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","reference","genre","artist","album","title","playlist","fetchSearchResults","Promise","all","map","track","artworkSource","resolveArtworkSource"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;AAGA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,aAAa,CAAC;EACzBC,WAAWA,CAASC,cAA8B,EAAE;IAAA,KAAhCA,cAA8B,GAA9BA,cAA8B;EAAG;;EAErD;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACH,cAAc,CAACI,aAAa,CAACC,MAAM,EAAEC,IAAI,CAC/DC,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAK,YACpB,CAAC;IACD,IAAI,CAACL,WAAW,EAAE;MAChB,OAAO,EAAE;IACX;IAEA,IAAIM,OAAgB,GAAG,EAAE;;IAEzB;IACA,IAAIN,WAAW,CAACO,cAAc,EAAE;MAC9BD,OAAO,GAAG,MAAMN,WAAW,CAACO,cAAc,CAACR,MAAM,CAAC;IACpD;IACA;IAAA,KACK,IAAIC,WAAW,CAACQ,YAAY,EAAE;MACjC;MACA,MAAMC,iBAAyC,GAAG;QAChDC,CAAC,EAAEX,MAAM,CAACY;MACZ,CAAC;MACD,IAAIZ,MAAM,CAACa,IAAI,EAAEH,iBAAiB,CAACG,IAAI,GAAGb,MAAM,CAACa,IAAI;MACrD,IAAIb,MAAM,CAACc,SAAS,KAAK,IAAI,EAAEJ,iBAAiB,CAACI,SAAS,GAAG,IAAI;MACjE,IAAId,MAAM,CAACe,KAAK,EAAEL,iBAAiB,CAACK,KAAK,GAAGf,MAAM,CAACe,KAAK;MACxD,IAAIf,MAAM,CAACgB,MAAM,EAAEN,iBAAiB,CAACM,MAAM,GAAGhB,MAAM,CAACgB,MAAM;MAC3D,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,KAAK,EAAER,iBAAiB,CAACQ,KAAK,GAAGlB,MAAM,CAACkB,KAAK;MACxD,IAAIlB,MAAM,CAACmB,QAAQ,EAAET,iBAAiB,CAACS,QAAQ,GAAGnB,MAAM,CAACmB,QAAQ;;MAEjE;MACA;MACAZ,OAAO,GAAG,MAAM,IAAI,CAACT,cAAc,CAACsB,kBAAkB,CACpDnB,WAAW,CAACQ,YAAY,EACxBC,iBACF,CAAC;IACH;;IAEA;IACA;IACA;IACAH,OAAO,GAAG,MAAMc,OAAO,CAACC,GAAG,CACzBf,OAAO,CAACgB,GAAG,CAAC,MAAOC,KAAK,IAAK;MAC3B,MAAMC,aAAa,GACjB,MAAM,IAAI,CAAC3B,cAAc,CAAC4B,oBAAoB,CAACF,KAAK,CAAC;MACvD,IAAIC,aAAa,IAAI,CAACD,KAAK,CAACC,aAAa,EAAE;QACzC,OAAO;UAAE,GAAGD,KAAK;UAAEC;QAAc,CAAC;MACpC;MACA,OAAOD,KAAK;IACd,CAAC,CACH,CAAC;IAED,OAAOjB,OAAO;EAChB;AACF","ignoreList":[]}
|
|
@@ -4,10 +4,13 @@ import { artworkUrl as resolveArtworkUrl } from '../../utils/artwork';
|
|
|
4
4
|
import { BrowserPathHelper } from '../util/BrowserPathHelper';
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* Appends query parameters to a URL, handling existing query strings.
|
|
7
|
+
* Appends query parameters to a URL, handling existing query strings. A
|
|
8
|
+
* `data:` URL comes back unchanged: what follows its comma is the payload.
|
|
8
9
|
*/
|
|
9
10
|
function appendQueryParams(url, query) {
|
|
10
|
-
if (!query || Object.keys(query).length === 0
|
|
11
|
+
if (!query || Object.keys(query).length === 0 || /^data:/i.test(url)) {
|
|
12
|
+
return url;
|
|
13
|
+
}
|
|
11
14
|
const params = new URLSearchParams();
|
|
12
15
|
for (const [key, value] of Object.entries(query)) {
|
|
13
16
|
if (value !== undefined && value !== null) {
|
|
@@ -40,6 +43,41 @@ function applyImageQueryParams(config, imgParams, context) {
|
|
|
40
43
|
query
|
|
41
44
|
};
|
|
42
45
|
}
|
|
46
|
+
const TRACK_ID_TOKEN = '{id}';
|
|
47
|
+
function unconfiguredArtworkSource(artworkUrl) {
|
|
48
|
+
return artworkUrl ? {
|
|
49
|
+
uri: artworkUrl,
|
|
50
|
+
method: 'GET'
|
|
51
|
+
} : undefined;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* The image source a finished artwork request loads, with `{id}` in its path,
|
|
56
|
+
* query and headers replaced by `id`. Without a non-empty `id` the token
|
|
57
|
+
* stays, so the request fails with a URL that says why, and a warning names
|
|
58
|
+
* it. Undefined when the request has no path.
|
|
59
|
+
*/
|
|
60
|
+
function artworkImageSource(request, id) {
|
|
61
|
+
const fill = value => id ? value.split(TRACK_ID_TOKEN).join(id) : value;
|
|
62
|
+
const fillValues = values => values && Object.fromEntries(Object.entries(values).map(([key, value]) => [key, fill(value)]));
|
|
63
|
+
if (request.path === undefined) return undefined;
|
|
64
|
+
const filled = {
|
|
65
|
+
...request,
|
|
66
|
+
path: fill(request.path),
|
|
67
|
+
query: fillValues(request.query),
|
|
68
|
+
headers: fillValues(request.headers)
|
|
69
|
+
};
|
|
70
|
+
const uri = RequestConfigBuilder.buildUrl(filled);
|
|
71
|
+
if ([filled.path, ...Object.values(filled.query ?? {}), ...Object.values(filled.headers ?? {})].some(value => value?.includes(TRACK_ID_TOKEN))) {
|
|
72
|
+
console.warn(`Artwork: track has no id, '{id}' left unfilled in ${uri}`);
|
|
73
|
+
}
|
|
74
|
+
return {
|
|
75
|
+
uri,
|
|
76
|
+
method: filled.method ?? 'GET',
|
|
77
|
+
headers: filled.headers,
|
|
78
|
+
body: filled.body
|
|
79
|
+
};
|
|
80
|
+
}
|
|
43
81
|
|
|
44
82
|
/** Whether `after` carries a header `before` had not already set identically. */
|
|
45
83
|
function addsHeaders(before, after) {
|
|
@@ -255,42 +293,23 @@ export const RequestConfigBuilder = {
|
|
|
255
293
|
return resolved;
|
|
256
294
|
},
|
|
257
295
|
/**
|
|
258
|
-
*
|
|
259
|
-
*
|
|
296
|
+
* `track`'s artwork through the static fields of the shared `request` layer
|
|
297
|
+
* and the `artwork` config: the async resolution without the request
|
|
298
|
+
* layer's transform, the config's resolvers and transforms, or a size.
|
|
260
299
|
*
|
|
261
|
-
* The
|
|
262
|
-
* cannot run an async `request.transform`, so transform-based shaping (e.g. a
|
|
263
|
-
* dynamic baseUrl) only applies on the async resolution paths. Queue tracks
|
|
264
|
-
* usually already carry an `artworkSource` resolved at browse-time, so this
|
|
265
|
-
* sync fallback rarely runs.
|
|
266
|
-
*
|
|
267
|
-
* @param artworkUrl The artwork URL (may be relative or absolute)
|
|
300
|
+
* @param track The track whose `artwork` (relative or absolute) to resolve
|
|
268
301
|
* @param requestConfig The shared request configuration (static fields only)
|
|
269
302
|
* @param artworkConfig The artwork request configuration
|
|
270
303
|
* @returns ImageSource with resolved URI, or undefined if no artwork
|
|
271
304
|
*/
|
|
272
|
-
resolveArtworkSource(
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
let config = {
|
|
305
|
+
resolveArtworkSource(track, requestConfig, artworkConfig) {
|
|
306
|
+
const artworkUrl = resolveArtworkUrl(track.artwork);
|
|
307
|
+
if (!artworkConfig) return unconfiguredArtworkSource(artworkUrl);
|
|
308
|
+
const base = {
|
|
309
|
+
...this.toRequestConfig(requestConfig ?? {}),
|
|
278
310
|
path: artworkUrl
|
|
279
311
|
};
|
|
280
|
-
|
|
281
|
-
config = this.mergeConfig(this.toRequestConfig(requestConfig), {
|
|
282
|
-
path: artworkUrl
|
|
283
|
-
});
|
|
284
|
-
}
|
|
285
|
-
if (artworkConfig) {
|
|
286
|
-
config = this.mergeConfig(config, this.toRequestConfig(artworkConfig));
|
|
287
|
-
}
|
|
288
|
-
const resolvedUri = BrowserPathHelper.buildUrl(config.baseUrl, config.path ?? artworkUrl);
|
|
289
|
-
return {
|
|
290
|
-
uri: resolvedUri,
|
|
291
|
-
method: config.method ?? 'GET',
|
|
292
|
-
headers: config.headers
|
|
293
|
-
};
|
|
312
|
+
return artworkImageSource(this.mergeConfig(base, this.toRequestConfig(artworkConfig)), track.id);
|
|
294
313
|
},
|
|
295
314
|
/**
|
|
296
315
|
* Resolves an artwork URL asynchronously with full Track access.
|
|
@@ -314,19 +333,7 @@ export const RequestConfigBuilder = {
|
|
|
314
333
|
// Collapses a per-appearance pair to one URL: this pipeline produces a
|
|
315
334
|
// single `ImageSource`, and the web fallback renders one <Image>.
|
|
316
335
|
const artworkUrl = resolveArtworkUrl(track.artwork);
|
|
317
|
-
|
|
318
|
-
// If no config and no track.artwork, nothing to transform
|
|
319
|
-
if (!artworkConfig && !artworkUrl) {
|
|
320
|
-
return undefined;
|
|
321
|
-
}
|
|
322
|
-
|
|
323
|
-
// If no artwork config, just return the original artwork URL
|
|
324
|
-
if (!artworkConfig) {
|
|
325
|
-
return artworkUrl ? {
|
|
326
|
-
uri: artworkUrl,
|
|
327
|
-
method: 'GET'
|
|
328
|
-
} : undefined;
|
|
329
|
-
}
|
|
336
|
+
if (!artworkConfig) return unconfiguredArtworkSource(artworkUrl);
|
|
330
337
|
try {
|
|
331
338
|
// Step 0: Apply the shared request layer, with track.artwork as the path.
|
|
332
339
|
// Its transform (if any) runs for artwork too — e.g. a dynamic baseUrl.
|
|
@@ -361,16 +368,7 @@ export const RequestConfigBuilder = {
|
|
|
361
368
|
context: imageContext
|
|
362
369
|
});
|
|
363
370
|
}
|
|
364
|
-
|
|
365
|
-
// Build final URL
|
|
366
|
-
const resolvedUri = BrowserPathHelper.buildUrl(mergedConfig.baseUrl, mergedConfig.path ?? artworkUrl ?? '');
|
|
367
|
-
const finalUri = appendQueryParams(resolvedUri, mergedConfig.query);
|
|
368
|
-
return {
|
|
369
|
-
uri: finalUri,
|
|
370
|
-
method: mergedConfig.method ?? 'GET',
|
|
371
|
-
headers: mergedConfig.headers,
|
|
372
|
-
body: mergedConfig.body
|
|
373
|
-
};
|
|
371
|
+
return artworkImageSource(mergedConfig, track.id);
|
|
374
372
|
} catch (error) {
|
|
375
373
|
// resolve/transform threw - log error, return undefined to avoid broken images
|
|
376
374
|
console.error('Failed to resolve artwork URL:', error);
|
|
@@ -390,7 +388,7 @@ export const RequestConfigBuilder = {
|
|
|
390
388
|
transformTrackArtwork(track, requestConfig, artworkConfig) {
|
|
391
389
|
// If artworkSource is already set, don't override it
|
|
392
390
|
if (track.artworkSource) return track;
|
|
393
|
-
const artworkSource = this.resolveArtworkSource(
|
|
391
|
+
const artworkSource = this.resolveArtworkSource(track, requestConfig, artworkConfig);
|
|
394
392
|
if (!artworkSource) return track;
|
|
395
393
|
return {
|
|
396
394
|
...track,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["artworkUrl","resolveArtworkUrl","BrowserPathHelper","appendQueryParams","url","query","Object","keys","length","params","URLSearchParams","key","value","entries","undefined","append","String","queryString","toString","separator","includes","applyImageQueryParams","config","imgParams","context","width","height","addsHeaders","before","after","some","RequestConfigBuilder","buildUrl","path","baseUrl","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","applyLayer","layer","transform","transformSync","cfg","e","console","error","applyLayers","layers","merged","toRequestConfig","resolveMediaRequest","src","requestConfig","mediaConfig","track","shared","layered","applyMediaResolve","mediaLayerHeaders","resolve","resolveSync","resolved","composeResolved","sync","resolveArtworkSource","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","imageContext","artwork","baseConfig","resolvedConfig","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":";;AAUA,SAASA,UAAU,IAAIC,iBAAiB,QAAQ,qBAAqB;AACrE,SAASC,iBAAiB,QAAQ,2BAA2B;;AAE7D;AACA;AACA;AACA,SAASC,iBAAiBA,CACxBC,GAAW,EACXC,KAAqD,EAC7C;EACR,IAAI,CAACA,KAAK,IAAIC,MAAM,CAACC,IAAI,CAACF,KAAK,CAAC,CAACG,MAAM,KAAK,CAAC,EAAE,OAAOJ,GAAG;EAEzD,MAAMK,MAAM,GAAG,IAAIC,eAAe,CAAC,CAAC;EACpC,KAAK,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,IAAIN,MAAM,CAACO,OAAO,CAACR,KAAK,CAAC,EAAE;IAChD,IAAIO,KAAK,KAAKE,SAAS,IAAIF,KAAK,KAAK,IAAI,EAAE;MACzCH,MAAM,CAACM,MAAM,CAACJ,GAAG,EAAEK,MAAM,CAACJ,KAAK,CAAC,CAAC;IACnC;EACF;EACA,MAAMK,WAAW,GAAGR,MAAM,CAACS,QAAQ,CAAC,CAAC;EACrC,IAAI,CAACD,WAAW,EAAE,OAAOb,GAAG;EAE5B,MAAMe,SAAS,GAAGf,GAAG,CAACgB,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG;EAC/C,OAAOhB,GAAG,GAAGe,SAAS,GAAGF,WAAW;AACtC;;AAEA;AACA;AACA;AACA;AACA,SAASI,qBAAqBA,CAC5BC,MAAqB,EACrBC,SAAuC,EACvCC,OAAiC,EAClB;EACf,IAAI,CAACD,SAAS,IAAI,CAACC,OAAO,EAAE,OAAOF,MAAM;EAEzC,MAAMjB,KAA6B,GAAG;IAAE,GAAGiB,MAAM,CAACjB;EAAM,CAAC;EAEzD,IAAIkB,SAAS,CAACE,KAAK,IAAID,OAAO,CAACC,KAAK,EAAE;IACpCpB,KAAK,CAACkB,SAAS,CAACE,KAAK,CAAC,GAAGT,MAAM,CAACQ,OAAO,CAACC,KAAK,CAAC;EAChD;EACA,IAAIF,SAAS,CAACG,MAAM,IAAIF,OAAO,CAACE,MAAM,EAAE;IACtCrB,KAAK,CAACkB,SAAS,CAACG,MAAM,CAAC,GAAGV,MAAM,CAACQ,OAAO,CAACE,MAAM,CAAC;EAClD;EAEA,OAAO;IAAE,GAAGJ,MAAM;IAAEjB;EAAM,CAAC;AAC7B;;AAEA;AACA,SAASsB,WAAWA,CAClBC,MAA0C,EAC1CC,KAAyC,EAChC;EACT,IAAI,CAACA,KAAK,EAAE,OAAO,KAAK;EACxB,OAAOvB,MAAM,CAACO,OAAO,CAACgB,KAAK,CAAC,CAACC,IAAI,CAAC,CAAC,CAACnB,GAAG,EAAEC,KAAK,CAAC,KAAKgB,MAAM,GAAGjB,GAAG,CAAC,KAAKC,KAAK,CAAC;AAC9E;AAgBA;AACA;AACA;AACA;AACA,OAAO,MAAMmB,oBAAoB,GAAG;EAClC;AACF;AACA;AACA;EACEC,QAAQA,CAACV,MAAqB,EAAU;IACtC,MAAMW,IAAI,GAAGX,MAAM,CAACW,IAAI,IAAI,EAAE;IAC9B,MAAMC,OAAO,GAAGZ,MAAM,CAACY,OAAO;;IAE9B;IACA,MAAM9B,GAAG,GAAGF,iBAAiB,CAAC8B,QAAQ,CAACE,OAAO,EAAED,IAAI,CAAC;;IAErD;IACA,OAAO9B,iBAAiB,CAACC,GAAG,EAAEkB,MAAM,CAACjB,KAAK,CAAC;EAC7C,CAAC;EAED;AACF;AACA;AACA;EACE8B,WAAWA,CAACC,IAAmB,EAAEC,QAAuB,EAAiB;IACvE,OAAO;MACLJ,IAAI,EAAEI,QAAQ,CAACJ,IAAI,IAAIG,IAAI,CAACH,IAAI;MAChCK,MAAM,EAAED,QAAQ,CAACC,MAAM,IAAIF,IAAI,CAACE,MAAM;MACtCJ,OAAO,EAAEG,QAAQ,CAACH,OAAO,IAAIE,IAAI,CAACF,OAAO;MACzCK,OAAO,EAAE,IAAI,CAACC,YAAY,CAACJ,IAAI,CAACG,OAAO,EAAEF,QAAQ,CAACE,OAAO,CAAC;MAC1DlC,KAAK,EAAE,IAAI,CAACoC,UAAU,CAACL,IAAI,CAAC/B,KAAK,EAAEgC,QAAQ,CAAChC,KAAK,CAAC;MAClDqC,IAAI,EAAEL,QAAQ,CAACK,IAAI,IAAIN,IAAI,CAACM,IAAI;MAChCC,WAAW,EAAEN,QAAQ,CAACM,WAAW,IAAIP,IAAI,CAACO,WAAW;MACrDC,SAAS,EAAEP,QAAQ,CAACO,SAAS,IAAIR,IAAI,CAACQ;IACxC,CAAC;EACH,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,UAAUA,CACdT,IAAmB,EACnBU,KAA6C,EAC7CrC,MAA+B,EACP;IACxB,IAAI,CAACqC,KAAK,EAAE,OAAOV,IAAI;IACvB;IACA;IACA;IACA,IAAIU,KAAK,CAACC,SAAS,IAAID,KAAK,CAACE,aAAa,EAAE;MAC1C,IAAI;QACF,IAAIC,GAAG,GAAGb,IAAI;QACd,IAAIU,KAAK,CAACC,SAAS,EAAEE,GAAG,GAAG,MAAMH,KAAK,CAACC,SAAS,CAACE,GAAG,EAAExC,MAAM,CAAC;QAC7D,IAAIqC,KAAK,CAACE,aAAa,EAAEC,GAAG,GAAGH,KAAK,CAACE,aAAa,CAACC,GAAG,EAAExC,MAAM,CAAC;QAC/D,OAAOwC,GAAG;MACZ,CAAC,CAAC,OAAOC,CAAC,EAAE;QACV;QACA;QACA;QACA;QACA;QACA;QACAC,OAAO,CAACC,KAAK,CACX,uDAAuD,EACvDF,CACF,CAAC;QACD,OAAOd,IAAI;MACb;IACF;IACA,OAAO;MACLE,MAAM,EAAEQ,KAAK,CAACR,MAAM,IAAIF,IAAI,CAACE,MAAM;MACnCL,IAAI,EAAEG,IAAI,CAACH,IAAI;MACfC,OAAO,EAAEY,KAAK,CAACZ,OAAO,IAAIE,IAAI,CAACF,OAAO;MACtCK,OAAO,EAAE,IAAI,CAACC,YAAY,CAACJ,IAAI,CAACG,OAAO,EAAEO,KAAK,CAACP,OAAO,CAAC;MACvDlC,KAAK,EAAE,IAAI,CAACoC,UAAU,CAACL,IAAI,CAAC/B,KAAK,EAAEyC,KAAK,CAACzC,KAAK,CAAC;MAC/CqC,IAAI,EAAEI,KAAK,CAACJ,IAAI,IAAIN,IAAI,CAACM,IAAI;MAC7BC,WAAW,EAAEG,KAAK,CAACH,WAAW,IAAIP,IAAI,CAACO,WAAW;MAClDC,SAAS,EAAEE,KAAK,CAACF,SAAS,IAAIR,IAAI,CAACQ;IACrC,CAAC;EACH,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMS,WAAWA,CACfjB,IAAmB,EACnBkB,MAAkD,EAClD7C,MAA+B,EACP;IACxB,IAAI8C,MAAM,GAAGnB,IAAI;IACjB,KAAK,MAAMU,KAAK,IAAIQ,MAAM,EAAE;MAC1BC,MAAM,GAAG,MAAM,IAAI,CAACV,UAAU,CAACU,MAAM,EAAET,KAAK,EAAErC,MAAM,CAAC;IACvD;IACA,OAAO8C,MAAM;EACf,CAAC;EAED;AACF;AACA;EACEC,eAAeA,CACblC,MAGwB,EACT;IACf,OAAO;MACLW,IAAI,EAAEX,MAAM,CAACW,IAAI;MACjBK,MAAM,EAAEhB,MAAM,CAACgB,MAAM;MACrBJ,OAAO,EAAEZ,MAAM,CAACY,OAAO;MACvBK,OAAO,EAAEjB,MAAM,CAACiB,OAAO;MACvBlC,KAAK,EAAEiB,MAAM,CAACjB,KAAK;MACnBqC,IAAI,EAAEpB,MAAM,CAACoB,IAAI;MACjBC,WAAW,EAAErB,MAAM,CAACqB,WAAW;MAC/BC,SAAS,EAAEtB,MAAM,CAACsB;IACpB,CAAC;EACH,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMa,mBAAmBA,CACvBC,GAAW,EACXC,aAAqD,EACrDC,WAA2C,EAC3CC,KAAa,EACkB;IAC/B,IAAI;MACF;MACA;MACA;MACA,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACjB,UAAU,CAAC;QAAEZ,IAAI,EAAEyB;MAAI,CAAC,EAAEC,aAAa,CAAC;MAClE,MAAMI,OAAO,GAAG,MAAM,IAAI,CAAClB,UAAU,CAACiB,MAAM,EAAEF,WAAW,CAAC;MAC1D,MAAMtC,MAAM,GAAG,MAAM,IAAI,CAAC0C,iBAAiB,CAACD,OAAO,EAAEH,WAAW,EAAEC,KAAK,CAAC;MACxE;MACA;MACA,OAAO;QACL,GAAGvC,MAAM;QACTY,OAAO,EAAEpB,SAAS;QAClBT,KAAK,EAAES,SAAS;QAChBmB,IAAI,EAAE,IAAI,CAACD,QAAQ,CAAC;UAAE,GAAGV,MAAM;UAAEW,IAAI,EAAEX,MAAM,CAACW,IAAI,IAAIyB;QAAI,CAAC,CAAC;QAC5DO,iBAAiB,EAAEtC,WAAW,CAACmC,MAAM,CAACvB,OAAO,EAAEjB,MAAM,CAACiB,OAAO;MAC/D,CAAC;IACH,CAAC,CAAC,OAAOW,CAAC,EAAE;MACVC,OAAO,CAACC,KAAK,CAAC,iDAAiD,EAAEF,CAAC,CAAC;MACnE,OAAO;QACLjB,IAAI,EAAE/B,iBAAiB,CAAC8B,QAAQ,CAAClB,SAAS,EAAE4C,GAAG,CAAC;QAChDO,iBAAiB,EAAE;MACrB,CAAC;IACH;EACF,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMD,iBAAiBA,CACrBD,OAAsB,EACtBH,WAA2C,EAC3CC,KAAwB,EACA;IACxB,IAAI,CAACA,KAAK,IAAI,CAACD,WAAW,EAAE,OAAOG,OAAO;IAC1C,IAAI,CAACH,WAAW,CAACM,OAAO,IAAI,CAACN,WAAW,CAACO,WAAW,EAAE,OAAOJ,OAAO;IAEpE,IAAI;MACF,MAAMK,QAAQ,GAAG,MAAM,IAAI,CAACC,eAAe,CAACT,WAAW,EAAEC,KAAK,CAAC;MAC/D,OAAOO,QAAQ,GAAG,IAAI,CAACjC,WAAW,CAAC4B,OAAO,EAAEK,QAAQ,CAAC,GAAGL,OAAO;IACjE,CAAC,CAAC,OAAOb,CAAC,EAAE;MACVC,OAAO,CAACC,KAAK,CAAC,qDAAqD,EAAEF,CAAC,CAAC;MACvE,OAAOa,OAAO;IAChB;EACF,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMM,eAAeA,CACnB/C,MAA2D,EAC3DuC,KAAY,EACwB;IACpC,IAAIO,QAAmC;IACvC,IAAI9C,MAAM,CAAC4C,OAAO,EAAEE,QAAQ,GAAG,MAAM9C,MAAM,CAAC4C,OAAO,CAACL,KAAK,CAAC;IAC1D,IAAIvC,MAAM,CAAC6C,WAAW,EAAE;MACtB,MAAMG,IAAI,GAAGhD,MAAM,CAAC6C,WAAW,CAACN,KAAK,CAAC;MACtCO,QAAQ,GAAGA,QAAQ,GAAG,IAAI,CAACjC,WAAW,CAACiC,QAAQ,EAAEE,IAAI,CAAC,GAAGA,IAAI;IAC/D;IACA,OAAOF,QAAQ;EACjB,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,oBAAoBA,CAClBvE,UAA8B,EAC9B2D,aAAqD,EACrDa,aAA+C,EACtB;IACzB,IAAI,CAACxE,UAAU,EAAE,OAAOc,SAAS;;IAEjC;IACA;IACA,IAAIQ,MAAqB,GAAG;MAAEW,IAAI,EAAEjC;IAAW,CAAC;IAChD,IAAI2D,aAAa,EAAE;MACjBrC,MAAM,GAAG,IAAI,CAACa,WAAW,CAAC,IAAI,CAACqB,eAAe,CAACG,aAAa,CAAC,EAAE;QAC7D1B,IAAI,EAAEjC;MACR,CAAC,CAAC;IACJ;IACA,IAAIwE,aAAa,EAAE;MACjBlD,MAAM,GAAG,IAAI,CAACa,WAAW,CAACb,MAAM,EAAE,IAAI,CAACkC,eAAe,CAACgB,aAAa,CAAC,CAAC;IACxE;IAEA,MAAMC,WAAW,GAAGvE,iBAAiB,CAAC8B,QAAQ,CAC5CV,MAAM,CAACY,OAAO,EACdZ,MAAM,CAACW,IAAI,IAAIjC,UACjB,CAAC;IAED,OAAO;MACL0E,GAAG,EAAED,WAAW;MAChBnC,MAAM,EAAEhB,MAAM,CAACgB,MAAM,IAAI,KAAK;MAC9BC,OAAO,EAAEjB,MAAM,CAACiB;IAClB,CAAC;EACH,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMoC,yBAAyBA,CAC7Bd,KAAY,EACZF,aAAqD,EACrDa,aAA+C,EAC/CI,YAA2B,EACO;IAClC;IACA;IACA,MAAM5E,UAAU,GAAGC,iBAAiB,CAAC4D,KAAK,CAACgB,OAAO,CAAC;;IAEnD;IACA,IAAI,CAACL,aAAa,IAAI,CAACxE,UAAU,EAAE;MACjC,OAAOc,SAAS;IAClB;;IAEA;IACA,IAAI,CAAC0D,aAAa,EAAE;MAClB,OAAOxE,UAAU,GAAG;QAAE0E,GAAG,EAAE1E,UAAU;QAAEsC,MAAM,EAAE;MAAM,CAAC,GAAGxB,SAAS;IACpE;IAEA,IAAI;MACF;MACA;MACA,MAAMgE,UAAU,GAAG,MAAM,IAAI,CAACjC,UAAU,CACtC;QAAEZ,IAAI,EAAEjC;MAAW,CAAC,EACpB2D,aACF,CAAC;;MAED;MACA;MACA,MAAMoB,cAAc,GAAG,MAAM,IAAI,CAACV,eAAe,CAACG,aAAa,EAAEX,KAAK,CAAC;MACvE;MACA,IACE,CAACW,aAAa,CAACN,OAAO,IAAIM,aAAa,CAACL,WAAW,KACnD,CAACY,cAAc,IACf/E,UAAU,KAAKc,SAAS,EACxB;QACA,OAAOA,SAAS;MAClB;;MAEA;MACA,IAAIkE,YAAY,GAAG,IAAI,CAAC7C,WAAW,CACjC,IAAI,CAACA,WAAW,CAAC2C,UAAU,EAAE,IAAI,CAACtB,eAAe,CAACgB,aAAa,CAAC,CAAC,EACjEO,cAAc,IAAI,CAAC,CACrB,CAAC;;MAED;MACAC,YAAY,GAAG3D,qBAAqB,CAClC2D,YAAY,EACZR,aAAa,CAACS,gBAAgB,EAC9BL,YACF,CAAC;;MAED;MACA,IAAIJ,aAAa,CAACzB,SAAS,EAAE;QAC3BiC,YAAY,GAAG,MAAMR,aAAa,CAACzB,SAAS,CAAC;UAC3CmC,OAAO,EAAEF,YAAY;UACrBxD,OAAO,EAAEoD;QACX,CAAC,CAAC;MACJ;MACA,IAAIJ,aAAa,CAACxB,aAAa,EAAE;QAC/BgC,YAAY,GAAGR,aAAa,CAACxB,aAAa,CAAC;UACzCkC,OAAO,EAAEF,YAAY;UACrBxD,OAAO,EAAEoD;QACX,CAAC,CAAC;MACJ;;MAEA;MACA,MAAMH,WAAW,GAAGvE,iBAAiB,CAAC8B,QAAQ,CAC5CgD,YAAY,CAAC9C,OAAO,EACpB8C,YAAY,CAAC/C,IAAI,IAAIjC,UAAU,IAAI,EACrC,CAAC;MACD,MAAMmF,QAAQ,GAAGhF,iBAAiB,CAACsE,WAAW,EAAEO,YAAY,CAAC3E,KAAK,CAAC;MAEnE,OAAO;QACLqE,GAAG,EAAES,QAAQ;QACb7C,MAAM,EAAE0C,YAAY,CAAC1C,MAAM,IAAI,KAAK;QACpCC,OAAO,EAAEyC,YAAY,CAACzC,OAAO;QAC7BG,IAAI,EAAEsC,YAAY,CAACtC;MACrB,CAAC;IACH,CAAC,CAAC,OAAOU,KAAK,EAAE;MACd;MACAD,OAAO,CAACC,KAAK,CAAC,gCAAgC,EAAEA,KAAK,CAAC;MACtD,OAAOtC,SAAS;IAClB;EACF,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEsE,qBAAqBA,CACnBvB,KAAY,EACZF,aAAqD,EACrDa,aAA+C,EACxC;IACP;IACA,IAAIX,KAAK,CAACwB,aAAa,EAAE,OAAOxB,KAAK;IAErC,MAAMwB,aAAa,GAAG,IAAI,CAACd,oBAAoB,CAC7CtE,iBAAiB,CAAC4D,KAAK,CAACgB,OAAO,CAAC,EAChClB,aAAa,EACba,aACF,CAAC;IACD,IAAI,CAACa,aAAa,EAAE,OAAOxB,KAAK;IAEhC,OAAO;MACL,GAAGA,KAAK;MACRwB;IACF,CAAC;EACH,CAAC;EAED;AACF;AACA;EACE7C,YAAYA,CACVJ,IAAwC,EACxCC,QAA4C,EACR;IACpC,IAAI,CAACD,IAAI,EAAE,OAAOC,QAAQ;IAC1B,IAAI,CAACA,QAAQ,EAAE,OAAOD,IAAI;IAC1B,OAAO;MAAE,GAAGA,IAAI;MAAE,GAAGC;IAAS,CAAC;EACjC,CAAC;EAED;AACF;AACA;EACEI,UAAUA,CACRL,IAAwC,EACxCC,QAA4C,EACR;IACpC,IAAI,CAACD,IAAI,EAAE,OAAOC,QAAQ;IAC1B,IAAI,CAACA,QAAQ,EAAE,OAAOD,IAAI;IAC1B,OAAO;MAAE,GAAGA,IAAI;MAAE,GAAGC;IAAS,CAAC;EACjC;AACF,CAAU","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["artworkUrl","resolveArtworkUrl","BrowserPathHelper","appendQueryParams","url","query","Object","keys","length","test","params","URLSearchParams","key","value","entries","undefined","append","String","queryString","toString","separator","includes","applyImageQueryParams","config","imgParams","context","width","height","TRACK_ID_TOKEN","unconfiguredArtworkSource","uri","method","artworkImageSource","request","id","fill","split","join","fillValues","values","fromEntries","map","path","filled","headers","RequestConfigBuilder","buildUrl","some","console","warn","body","addsHeaders","before","after","baseUrl","mergeConfig","base","override","mergeHeaders","mergeQuery","contentType","userAgent","applyLayer","layer","transform","transformSync","cfg","e","error","applyLayers","layers","merged","toRequestConfig","resolveMediaRequest","src","requestConfig","mediaConfig","track","shared","layered","applyMediaResolve","mediaLayerHeaders","resolve","resolveSync","resolved","composeResolved","sync","resolveArtworkSource","artworkConfig","artwork","resolveArtworkSourceAsync","imageContext","baseConfig","resolvedConfig","mergedConfig","imageQueryParams","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -22,27 +22,8 @@ export class NowPlayingManager {
|
|
|
22
22
|
*/
|
|
23
23
|
updateNowPlaying(update, currentTrack, duration) {
|
|
24
24
|
this.override = update;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
title: update.title ?? currentTrack.title,
|
|
28
|
-
artist: update.artist ?? currentTrack.artist,
|
|
29
|
-
album: update.album ?? currentTrack.album,
|
|
30
|
-
artwork: artworkUrl(currentTrack.artwork),
|
|
31
|
-
description: currentTrack.description,
|
|
32
|
-
mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
|
|
33
|
-
genre: currentTrack.genre,
|
|
34
|
-
duration
|
|
35
|
-
} : {
|
|
36
|
-
title: currentTrack.title,
|
|
37
|
-
artist: currentTrack.artist,
|
|
38
|
-
album: currentTrack.album,
|
|
39
|
-
artwork: artworkUrl(currentTrack.artwork),
|
|
40
|
-
description: currentTrack.description,
|
|
41
|
-
mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
|
|
42
|
-
genre: currentTrack.genre,
|
|
43
|
-
duration
|
|
44
|
-
};
|
|
45
|
-
this.onNowPlayingChanged(metadata);
|
|
25
|
+
const metadata = this.getNowPlaying(currentTrack, duration);
|
|
26
|
+
if (metadata) this.onNowPlayingChanged(metadata);
|
|
46
27
|
}
|
|
47
28
|
|
|
48
29
|
/**
|
|
@@ -58,7 +39,7 @@ export class NowPlayingManager {
|
|
|
58
39
|
title: this.override?.title ?? currentTrack.title,
|
|
59
40
|
artist: this.override?.artist ?? currentTrack.artist,
|
|
60
41
|
album: this.override?.album ?? currentTrack.album,
|
|
61
|
-
artwork: artworkUrl(currentTrack.artwork),
|
|
42
|
+
artwork: currentTrack.artworkSource?.uri ?? artworkUrl(currentTrack.artwork),
|
|
62
43
|
description: currentTrack.description,
|
|
63
44
|
mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
|
|
64
45
|
genre: currentTrack.genre,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["artworkUrl","getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","
|
|
1
|
+
{"version":3,"names":["artworkUrl","getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","getNowPlaying","undefined","title","artist","album","artwork","artworkSource","uri","description","mediaId","path","genre","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;IACtB,MAAMI,QAAQ,GAAG,IAAI,CAACC,aAAa,CAACJ,YAAY,EAAEC,QAAQ,CAAC;IAC3D,IAAIE,QAAQ,EAAE,IAAI,CAACN,mBAAmB,CAACM,QAAQ,CAAC;EAClD;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEC,aAAaA,CACXJ,YAA+B,EAC/BC,QAAgB,EACgB;IAChC,IAAI,CAACD,YAAY,EAAE,OAAOK,SAAS;IAEnC,OAAO;MACLC,KAAK,EAAE,IAAI,CAACJ,QAAQ,EAAEI,KAAK,IAAIN,YAAY,CAACM,KAAK;MACjDC,MAAM,EAAE,IAAI,CAACL,QAAQ,EAAEK,MAAM,IAAIP,YAAY,CAACO,MAAM;MACpDC,KAAK,EAAE,IAAI,CAACN,QAAQ,EAAEM,KAAK,IAAIR,YAAY,CAACQ,KAAK;MACjDC,OAAO,EACLT,YAAY,CAACU,aAAa,EAAEC,GAAG,IAAIjB,UAAU,CAACM,YAAY,CAACS,OAAO,CAAC;MACrEG,WAAW,EAAEZ,YAAY,CAACY,WAAW;MACrCC,OAAO,EAAElB,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACc,IAAI;MAC5DC,KAAK,EAAEf,YAAY,CAACe,KAAK;MACzBd;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEe,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAACd,QAAQ,GAAGG,SAAS;EAC3B;AACF","ignoreList":[]}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
const isAbsoluteUrl = url => /^([a-z][a-z\d+.-]*:|\/\/)/i.test(url);
|
|
4
|
+
|
|
3
5
|
/**
|
|
4
6
|
* Utility for handling browser paths and contextual URLs in the media browser system.
|
|
5
7
|
* Mirrors Android's BrowserPathHelper.kt
|
|
@@ -162,15 +164,11 @@ export const BrowserPathHelper = {
|
|
|
162
164
|
* - buildUrl("http://example.com/", "/api/test") → "http://example.com/api/test"
|
|
163
165
|
* - buildUrl(undefined, "/api/test") → "/api/test"
|
|
164
166
|
* - buildUrl(undefined, "http://full.url") → "http://full.url"
|
|
167
|
+
* - buildUrl("http://example.com", "blob:http://app/id") → "blob:http://app/id"
|
|
168
|
+
* - buildUrl("http://example.com", "//cdn.example.com/a") → "//cdn.example.com/a"
|
|
165
169
|
*/
|
|
166
170
|
buildUrl(baseUrl, path) {
|
|
167
|
-
|
|
168
|
-
if (path.startsWith('http://') || path.startsWith('https://')) {
|
|
169
|
-
return path;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
// If no baseUrl, return path as-is
|
|
173
|
-
if (!baseUrl) {
|
|
171
|
+
if (!baseUrl || isAbsoluteUrl(path)) {
|
|
174
172
|
return path;
|
|
175
173
|
}
|
|
176
174
|
|