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
|
@@ -9,6 +9,7 @@ var _validation = require("../../utils/validation");
|
|
|
9
9
|
var _RequestConfigBuilder = require("../http/RequestConfigBuilder");
|
|
10
10
|
var _SimpleRouter = require("../SimpleRouter");
|
|
11
11
|
var _BrowserPathHelper = require("../util/BrowserPathHelper");
|
|
12
|
+
var _GenerationMemo = require("../util/GenerationMemo");
|
|
12
13
|
var _assertBrowsePageShape = require("./assertBrowsePageShape");
|
|
13
14
|
var _parseSearchResponse = require("./parseSearchResponse");
|
|
14
15
|
var _sections = require("./sections");
|
|
@@ -21,16 +22,10 @@ class BrowserManager {
|
|
|
21
22
|
_configuration = {};
|
|
22
23
|
router = new _SimpleRouter.SimpleRouter();
|
|
23
24
|
|
|
24
|
-
//
|
|
25
|
-
//
|
|
26
|
-
// and
|
|
27
|
-
|
|
28
|
-
_layerGeneration = 0;
|
|
29
|
-
_resolvedLayerGeneration = -1;
|
|
30
|
-
|
|
31
|
-
// Dedupes concurrent resolution within a generation (config-set triggers an
|
|
32
|
-
// initial navigate that can overlap with an explicit navigatePath), so a
|
|
33
|
-
// resolver is invoked exactly once per generation even under concurrency.
|
|
25
|
+
// The request and browse layers: each resolver's result, else the static
|
|
26
|
+
// layer, for the current content generation. The generation bumps on
|
|
27
|
+
// config-set and on invalidateAllContent().
|
|
28
|
+
layers = new _GenerationMemo.GenerationMemo();
|
|
34
29
|
|
|
35
30
|
// Navigation tracking to prevent race conditions (matches Android's @Volatile currentNavigationId)
|
|
36
31
|
currentNavigationId = 0;
|
|
@@ -121,7 +116,7 @@ class BrowserManager {
|
|
|
121
116
|
*/
|
|
122
117
|
set configuration(value) {
|
|
123
118
|
this._configuration = value;
|
|
124
|
-
this.
|
|
119
|
+
this.layers.invalidate();
|
|
125
120
|
this.navigationErrorManager.clearNavigationError();
|
|
126
121
|
this.navigationErrorManager.setFormatCallback(value.formatNavigationError);
|
|
127
122
|
|
|
@@ -176,7 +171,7 @@ class BrowserManager {
|
|
|
176
171
|
* to re-resolve it.
|
|
177
172
|
*/
|
|
178
173
|
invalidateAllContent() {
|
|
179
|
-
this.
|
|
174
|
+
this.layers.invalidate();
|
|
180
175
|
if (this._path) {
|
|
181
176
|
void this.navigate(this._path);
|
|
182
177
|
}
|
|
@@ -354,18 +349,12 @@ class BrowserManager {
|
|
|
354
349
|
// meant an app with no `artwork` block never populated the field at all —
|
|
355
350
|
// `resolveArtworkSourceAsync` already handles the no-config case the way
|
|
356
351
|
// `resolveArtworkUrl` does on Android.
|
|
357
|
-
const artworkConfig = this._configuration.artwork;
|
|
358
|
-
// The shared request layer applies to artwork too — use the resolved layer
|
|
359
|
-
// (resolver result or static config) so a resolver-only config still works.
|
|
360
|
-
await this.ensureLayersResolved();
|
|
361
|
-
const requestConfig = this._resolvedRequest;
|
|
362
|
-
|
|
363
352
|
// Transform parent artwork
|
|
364
|
-
const parentArtworkSource = await
|
|
353
|
+
const parentArtworkSource = await this.resolveArtworkSource(content);
|
|
365
354
|
|
|
366
355
|
// Transform children artwork, section by section
|
|
367
356
|
const transformTrack = async track => {
|
|
368
|
-
const artworkSource = await
|
|
357
|
+
const artworkSource = await this.resolveArtworkSource(track);
|
|
369
358
|
if (artworkSource && !track.artworkSource) {
|
|
370
359
|
return {
|
|
371
360
|
...track,
|
|
@@ -446,47 +435,32 @@ class BrowserManager {
|
|
|
446
435
|
* `BrowserManager.resolvedRequestConfig()`, which carries the same warning.
|
|
447
436
|
*/
|
|
448
437
|
async resolvedRequestConfig() {
|
|
449
|
-
await this.
|
|
450
|
-
return this._resolvedRequest;
|
|
438
|
+
return (await this.resolvedLayers()).request;
|
|
451
439
|
}
|
|
452
440
|
|
|
453
441
|
/**
|
|
454
|
-
*
|
|
455
|
-
*
|
|
456
|
-
* result cached; a static config (no resolver) passes through unchanged.
|
|
442
|
+
* `track`'s artwork through the resolved request layer and `artworkConfig`,
|
|
443
|
+
* else the `artwork` config. Rejects when the request layer's resolver does.
|
|
457
444
|
*/
|
|
458
|
-
async
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
445
|
+
async resolveArtworkSource(track, imageContext, artworkConfig = this._configuration.artwork) {
|
|
446
|
+
return _RequestConfigBuilder.RequestConfigBuilder.resolveArtworkSourceAsync(track, await this.resolvedRequestConfig(), artworkConfig, imageContext);
|
|
447
|
+
}
|
|
448
|
+
|
|
449
|
+
/**
|
|
450
|
+
* The request and browse layers of the current generation. A resolver runs
|
|
451
|
+
* once per generation, and again for a later caller when it outlasts
|
|
452
|
+
* {@link GenerationMemo}'s bound.
|
|
453
|
+
*/
|
|
454
|
+
resolvedLayers() {
|
|
455
|
+
return this.layers.value(async () => {
|
|
468
456
|
const cfg = this._configuration;
|
|
469
|
-
const
|
|
470
|
-
const
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
this._resolvedLayerGeneration = generation;
|
|
476
|
-
}
|
|
477
|
-
})().catch(err => {
|
|
478
|
-
// A failed resolution must not wedge the generation — clear the in-flight
|
|
479
|
-
// cache so the next navigation retries (e.g. a transient async resolver error).
|
|
480
|
-
if (this._layerResolution?.generation === generation) {
|
|
481
|
-
this._layerResolution = undefined;
|
|
482
|
-
}
|
|
483
|
-
throw err;
|
|
457
|
+
const request = cfg.requestResolver ? await cfg.requestResolver() : cfg.request;
|
|
458
|
+
const browse = cfg.browseResolver ? await cfg.browseResolver() : cfg.browse;
|
|
459
|
+
return {
|
|
460
|
+
request,
|
|
461
|
+
browse
|
|
462
|
+
};
|
|
484
463
|
});
|
|
485
|
-
this._layerResolution = {
|
|
486
|
-
generation,
|
|
487
|
-
promise
|
|
488
|
-
};
|
|
489
|
-
return promise;
|
|
490
464
|
}
|
|
491
465
|
|
|
492
466
|
/**
|
|
@@ -499,12 +473,12 @@ class BrowserManager {
|
|
|
499
473
|
* Mirrors native's BrowserManager.resolveFromConfig.
|
|
500
474
|
*/
|
|
501
475
|
async resolveFromConfig(kindConfig, routeConfig, path, params) {
|
|
502
|
-
await this.
|
|
476
|
+
const layers = await this.resolvedLayers();
|
|
503
477
|
const merged = await _RequestConfigBuilder.RequestConfigBuilder.applyLayers({
|
|
504
478
|
path
|
|
505
|
-
}, [
|
|
479
|
+
}, [layers.request,
|
|
506
480
|
// fall back to the route's kind config when no browse layer is configured
|
|
507
|
-
|
|
481
|
+
layers.browse ?? kindConfig, routeConfig], params);
|
|
508
482
|
const response = await this.httpClient.executeRequest(merged);
|
|
509
483
|
return (0, _assertBrowsePageShape.assertBrowsePageShape)(response, path);
|
|
510
484
|
}
|
|
@@ -518,11 +492,13 @@ class BrowserManager {
|
|
|
518
492
|
* isn't duplicated. Errors propagate to the caller.
|
|
519
493
|
*/
|
|
520
494
|
async fetchSearchResults(searchConfig, queryParams) {
|
|
521
|
-
|
|
495
|
+
const {
|
|
496
|
+
request
|
|
497
|
+
} = await this.resolvedLayers();
|
|
522
498
|
const merged = await _RequestConfigBuilder.RequestConfigBuilder.applyLayers({
|
|
523
499
|
path: searchConfig.path,
|
|
524
500
|
query: queryParams
|
|
525
|
-
}, [
|
|
501
|
+
}, [request, searchConfig], queryParams);
|
|
526
502
|
const response = await this.httpClient.executeRequest(merged);
|
|
527
503
|
return (0, _parseSearchResponse.parseSearchResponse)(response);
|
|
528
504
|
}
|
|
@@ -600,12 +576,8 @@ class BrowserManager {
|
|
|
600
576
|
// request layer (incl. its transform) applies, matching content/search.
|
|
601
577
|
// Gated per track inside the resolver, as on Android — see
|
|
602
578
|
// `transformArtworkForContent`.
|
|
603
|
-
const artworkConfig = this._configuration.artwork;
|
|
604
|
-
// Resolved request layer (resolver or static), matching content/search.
|
|
605
|
-
await this.ensureLayersResolved();
|
|
606
|
-
const requestConfig = this._resolvedRequest;
|
|
607
579
|
return Promise.all(tabs.map(async track => {
|
|
608
|
-
const artworkSource = await
|
|
580
|
+
const artworkSource = await this.resolveArtworkSource(track);
|
|
609
581
|
if (artworkSource && !track.artworkSource) {
|
|
610
582
|
return {
|
|
611
583
|
...track,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_getTrackIdentity","require","_validation","_RequestConfigBuilder","_SimpleRouter","_BrowserPathHelper","_assertBrowsePageShape","_parseSearchResponse","_sections","BrowserManager","_configuration","router","SimpleRouter","_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","flattenedChildren","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","BrowserPathHelper","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","sections","addContextualPaths","hydrateChildren","transformArtworkForContent","queryTabs","index","map","section","children","flatIndex","identity","getTrackIdentity","src","build","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","normalizePage","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","RequestConfigBuilder","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","assertBrowsePageShape","queryParams","parseSearchResponse","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","flattenSections","expandQueueFromContextualPath","contextualPath","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","rawSections","every","s","tappedIndex","extractIndex","scoped","sectionContaining","isQueueable","disabled","playableTracks","tracks","filter","selectedIndex","tappedOffset","tapped","slice","findIndex","singleTrack","assertedNotNullish","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackPath","createSearchPath","searchTracks","t","selectedIdx","isContextual","expanded","firstTab","exports"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_getTrackIdentity","require","_validation","_RequestConfigBuilder","_SimpleRouter","_BrowserPathHelper","_GenerationMemo","_assertBrowsePageShape","_parseSearchResponse","_sections","BrowserManager","_configuration","router","SimpleRouter","layers","GenerationMemo","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","flattenedChildren","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","BrowserPathHelper","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","sections","addContextualPaths","hydrateChildren","transformArtworkForContent","queryTabs","index","map","section","children","flatIndex","identity","getTrackIdentity","src","build","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","normalizePage","title","parentArtworkSource","resolveArtworkSource","transformTrack","artworkSource","transformedSections","Promise","all","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","resolvedRequestConfig","resolvedLayers","request","imageContext","artworkConfig","artwork","RequestConfigBuilder","resolveArtworkSourceAsync","cfg","requestResolver","browseResolver","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","assertBrowsePageShape","queryParams","parseSearchResponse","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","flattenSections","expandQueueFromContextualPath","contextualPath","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","rawSections","every","s","tappedIndex","extractIndex","scoped","sectionContaining","isQueueable","disabled","playableTracks","tracks","filter","selectedIndex","tappedOffset","tapped","slice","findIndex","singleTrack","assertedNotNullish","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackPath","createSearchPath","searchTracks","t","selectedIdx","isContextual","expanded","firstTab","exports"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.SearchManager = void 0;
|
|
7
|
-
var _RequestConfigBuilder = require("../http/RequestConfigBuilder");
|
|
8
7
|
/**
|
|
9
8
|
* Manages search functionality.
|
|
10
9
|
* Resolves search queries using configured __search__ route.
|
|
@@ -58,10 +57,8 @@ class SearchManager {
|
|
|
58
57
|
// Transform artwork URLs on search results using async method with full Track access
|
|
59
58
|
// Gated per track inside the resolver, as on Android — a result carrying a
|
|
60
59
|
// plain `artwork` URL resolves even with no `artwork` config.
|
|
61
|
-
const requestConfig = await this.browserManager.resolvedRequestConfig();
|
|
62
|
-
const artworkConfig = this.browserManager.configuration.artwork;
|
|
63
60
|
results = await Promise.all(results.map(async track => {
|
|
64
|
-
const artworkSource = await
|
|
61
|
+
const artworkSource = await this.browserManager.resolveArtworkSource(track);
|
|
65
62
|
if (artworkSource && !track.artworkSource) {
|
|
66
63
|
return {
|
|
67
64
|
...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","exports"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;;;;;AAGA;AACA;AACA;AACA;AACA;AACO,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;AAACoB,OAAA,CAAA/B,aAAA,GAAAA,aAAA","ignoreList":[]}
|
|
@@ -7,10 +7,13 @@ exports.RequestConfigBuilder = void 0;
|
|
|
7
7
|
var _artwork = require("../../utils/artwork");
|
|
8
8
|
var _BrowserPathHelper = require("../util/BrowserPathHelper");
|
|
9
9
|
/**
|
|
10
|
-
* Appends query parameters to a URL, handling existing query strings.
|
|
10
|
+
* Appends query parameters to a URL, handling existing query strings. A
|
|
11
|
+
* `data:` URL comes back unchanged: what follows its comma is the payload.
|
|
11
12
|
*/
|
|
12
13
|
function appendQueryParams(url, query) {
|
|
13
|
-
if (!query || Object.keys(query).length === 0
|
|
14
|
+
if (!query || Object.keys(query).length === 0 || /^data:/i.test(url)) {
|
|
15
|
+
return url;
|
|
16
|
+
}
|
|
14
17
|
const params = new URLSearchParams();
|
|
15
18
|
for (const [key, value] of Object.entries(query)) {
|
|
16
19
|
if (value !== undefined && value !== null) {
|
|
@@ -43,6 +46,41 @@ function applyImageQueryParams(config, imgParams, context) {
|
|
|
43
46
|
query
|
|
44
47
|
};
|
|
45
48
|
}
|
|
49
|
+
const TRACK_ID_TOKEN = '{id}';
|
|
50
|
+
function unconfiguredArtworkSource(artworkUrl) {
|
|
51
|
+
return artworkUrl ? {
|
|
52
|
+
uri: artworkUrl,
|
|
53
|
+
method: 'GET'
|
|
54
|
+
} : undefined;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* The image source a finished artwork request loads, with `{id}` in its path,
|
|
59
|
+
* query and headers replaced by `id`. Without a non-empty `id` the token
|
|
60
|
+
* stays, so the request fails with a URL that says why, and a warning names
|
|
61
|
+
* it. Undefined when the request has no path.
|
|
62
|
+
*/
|
|
63
|
+
function artworkImageSource(request, id) {
|
|
64
|
+
const fill = value => id ? value.split(TRACK_ID_TOKEN).join(id) : value;
|
|
65
|
+
const fillValues = values => values && Object.fromEntries(Object.entries(values).map(([key, value]) => [key, fill(value)]));
|
|
66
|
+
if (request.path === undefined) return undefined;
|
|
67
|
+
const filled = {
|
|
68
|
+
...request,
|
|
69
|
+
path: fill(request.path),
|
|
70
|
+
query: fillValues(request.query),
|
|
71
|
+
headers: fillValues(request.headers)
|
|
72
|
+
};
|
|
73
|
+
const uri = RequestConfigBuilder.buildUrl(filled);
|
|
74
|
+
if ([filled.path, ...Object.values(filled.query ?? {}), ...Object.values(filled.headers ?? {})].some(value => value?.includes(TRACK_ID_TOKEN))) {
|
|
75
|
+
console.warn(`Artwork: track has no id, '{id}' left unfilled in ${uri}`);
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
uri,
|
|
79
|
+
method: filled.method ?? 'GET',
|
|
80
|
+
headers: filled.headers,
|
|
81
|
+
body: filled.body
|
|
82
|
+
};
|
|
83
|
+
}
|
|
46
84
|
|
|
47
85
|
/** Whether `after` carries a header `before` had not already set identically. */
|
|
48
86
|
function addsHeaders(before, after) {
|
|
@@ -258,42 +296,23 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
|
|
|
258
296
|
return resolved;
|
|
259
297
|
},
|
|
260
298
|
/**
|
|
261
|
-
*
|
|
262
|
-
*
|
|
299
|
+
* `track`'s artwork through the static fields of the shared `request` layer
|
|
300
|
+
* and the `artwork` config: the async resolution without the request
|
|
301
|
+
* layer's transform, the config's resolvers and transforms, or a size.
|
|
263
302
|
*
|
|
264
|
-
* The
|
|
265
|
-
* cannot run an async `request.transform`, so transform-based shaping (e.g. a
|
|
266
|
-
* dynamic baseUrl) only applies on the async resolution paths. Queue tracks
|
|
267
|
-
* usually already carry an `artworkSource` resolved at browse-time, so this
|
|
268
|
-
* sync fallback rarely runs.
|
|
269
|
-
*
|
|
270
|
-
* @param artworkUrl The artwork URL (may be relative or absolute)
|
|
303
|
+
* @param track The track whose `artwork` (relative or absolute) to resolve
|
|
271
304
|
* @param requestConfig The shared request configuration (static fields only)
|
|
272
305
|
* @param artworkConfig The artwork request configuration
|
|
273
306
|
* @returns ImageSource with resolved URI, or undefined if no artwork
|
|
274
307
|
*/
|
|
275
|
-
resolveArtworkSource(
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
let config = {
|
|
308
|
+
resolveArtworkSource(track, requestConfig, artworkConfig) {
|
|
309
|
+
const artworkUrl = (0, _artwork.artworkUrl)(track.artwork);
|
|
310
|
+
if (!artworkConfig) return unconfiguredArtworkSource(artworkUrl);
|
|
311
|
+
const base = {
|
|
312
|
+
...this.toRequestConfig(requestConfig ?? {}),
|
|
281
313
|
path: artworkUrl
|
|
282
314
|
};
|
|
283
|
-
|
|
284
|
-
config = this.mergeConfig(this.toRequestConfig(requestConfig), {
|
|
285
|
-
path: artworkUrl
|
|
286
|
-
});
|
|
287
|
-
}
|
|
288
|
-
if (artworkConfig) {
|
|
289
|
-
config = this.mergeConfig(config, this.toRequestConfig(artworkConfig));
|
|
290
|
-
}
|
|
291
|
-
const resolvedUri = _BrowserPathHelper.BrowserPathHelper.buildUrl(config.baseUrl, config.path ?? artworkUrl);
|
|
292
|
-
return {
|
|
293
|
-
uri: resolvedUri,
|
|
294
|
-
method: config.method ?? 'GET',
|
|
295
|
-
headers: config.headers
|
|
296
|
-
};
|
|
315
|
+
return artworkImageSource(this.mergeConfig(base, this.toRequestConfig(artworkConfig)), track.id);
|
|
297
316
|
},
|
|
298
317
|
/**
|
|
299
318
|
* Resolves an artwork URL asynchronously with full Track access.
|
|
@@ -317,19 +336,7 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
|
|
|
317
336
|
// Collapses a per-appearance pair to one URL: this pipeline produces a
|
|
318
337
|
// single `ImageSource`, and the web fallback renders one <Image>.
|
|
319
338
|
const artworkUrl = (0, _artwork.artworkUrl)(track.artwork);
|
|
320
|
-
|
|
321
|
-
// If no config and no track.artwork, nothing to transform
|
|
322
|
-
if (!artworkConfig && !artworkUrl) {
|
|
323
|
-
return undefined;
|
|
324
|
-
}
|
|
325
|
-
|
|
326
|
-
// If no artwork config, just return the original artwork URL
|
|
327
|
-
if (!artworkConfig) {
|
|
328
|
-
return artworkUrl ? {
|
|
329
|
-
uri: artworkUrl,
|
|
330
|
-
method: 'GET'
|
|
331
|
-
} : undefined;
|
|
332
|
-
}
|
|
339
|
+
if (!artworkConfig) return unconfiguredArtworkSource(artworkUrl);
|
|
333
340
|
try {
|
|
334
341
|
// Step 0: Apply the shared request layer, with track.artwork as the path.
|
|
335
342
|
// Its transform (if any) runs for artwork too — e.g. a dynamic baseUrl.
|
|
@@ -364,16 +371,7 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
|
|
|
364
371
|
context: imageContext
|
|
365
372
|
});
|
|
366
373
|
}
|
|
367
|
-
|
|
368
|
-
// Build final URL
|
|
369
|
-
const resolvedUri = _BrowserPathHelper.BrowserPathHelper.buildUrl(mergedConfig.baseUrl, mergedConfig.path ?? artworkUrl ?? '');
|
|
370
|
-
const finalUri = appendQueryParams(resolvedUri, mergedConfig.query);
|
|
371
|
-
return {
|
|
372
|
-
uri: finalUri,
|
|
373
|
-
method: mergedConfig.method ?? 'GET',
|
|
374
|
-
headers: mergedConfig.headers,
|
|
375
|
-
body: mergedConfig.body
|
|
376
|
-
};
|
|
374
|
+
return artworkImageSource(mergedConfig, track.id);
|
|
377
375
|
} catch (error) {
|
|
378
376
|
// resolve/transform threw - log error, return undefined to avoid broken images
|
|
379
377
|
console.error('Failed to resolve artwork URL:', error);
|
|
@@ -393,7 +391,7 @@ const RequestConfigBuilder = exports.RequestConfigBuilder = {
|
|
|
393
391
|
transformTrackArtwork(track, requestConfig, artworkConfig) {
|
|
394
392
|
// If artworkSource is already set, don't override it
|
|
395
393
|
if (track.artworkSource) return track;
|
|
396
|
-
const artworkSource = this.resolveArtworkSource(
|
|
394
|
+
const artworkSource = this.resolveArtworkSource(track, requestConfig, artworkConfig);
|
|
397
395
|
if (!artworkSource) return track;
|
|
398
396
|
return {
|
|
399
397
|
...track,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_artwork","require","_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","exports","buildUrl","path","baseUrl","BrowserPathHelper","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","artworkUrl","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","imageContext","resolveArtworkUrl","artwork","baseConfig","resolvedConfig","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_artwork","require","_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","artworkUrl","uri","method","artworkImageSource","request","id","fill","split","join","fillValues","values","fromEntries","map","path","filled","headers","RequestConfigBuilder","buildUrl","some","console","warn","body","addsHeaders","before","after","exports","baseUrl","BrowserPathHelper","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","resolveArtworkUrl","artwork","resolveArtworkSourceAsync","imageContext","baseConfig","resolvedConfig","mergedConfig","imageQueryParams","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -25,27 +25,8 @@ class NowPlayingManager {
|
|
|
25
25
|
*/
|
|
26
26
|
updateNowPlaying(update, currentTrack, duration) {
|
|
27
27
|
this.override = update;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
title: update.title ?? currentTrack.title,
|
|
31
|
-
artist: update.artist ?? currentTrack.artist,
|
|
32
|
-
album: update.album ?? currentTrack.album,
|
|
33
|
-
artwork: (0, _artwork.artworkUrl)(currentTrack.artwork),
|
|
34
|
-
description: currentTrack.description,
|
|
35
|
-
mediaId: (0, _getTrackIdentity.getTrackIdentity)(currentTrack) ?? currentTrack.path,
|
|
36
|
-
genre: currentTrack.genre,
|
|
37
|
-
duration
|
|
38
|
-
} : {
|
|
39
|
-
title: currentTrack.title,
|
|
40
|
-
artist: currentTrack.artist,
|
|
41
|
-
album: currentTrack.album,
|
|
42
|
-
artwork: (0, _artwork.artworkUrl)(currentTrack.artwork),
|
|
43
|
-
description: currentTrack.description,
|
|
44
|
-
mediaId: (0, _getTrackIdentity.getTrackIdentity)(currentTrack) ?? currentTrack.path,
|
|
45
|
-
genre: currentTrack.genre,
|
|
46
|
-
duration
|
|
47
|
-
};
|
|
48
|
-
this.onNowPlayingChanged(metadata);
|
|
28
|
+
const metadata = this.getNowPlaying(currentTrack, duration);
|
|
29
|
+
if (metadata) this.onNowPlayingChanged(metadata);
|
|
49
30
|
}
|
|
50
31
|
|
|
51
32
|
/**
|
|
@@ -61,7 +42,7 @@ class NowPlayingManager {
|
|
|
61
42
|
title: this.override?.title ?? currentTrack.title,
|
|
62
43
|
artist: this.override?.artist ?? currentTrack.artist,
|
|
63
44
|
album: this.override?.album ?? currentTrack.album,
|
|
64
|
-
artwork: (0, _artwork.artworkUrl)(currentTrack.artwork),
|
|
45
|
+
artwork: currentTrack.artworkSource?.uri ?? (0, _artwork.artworkUrl)(currentTrack.artwork),
|
|
65
46
|
description: currentTrack.description,
|
|
66
47
|
mediaId: (0, _getTrackIdentity.getTrackIdentity)(currentTrack) ?? currentTrack.path,
|
|
67
48
|
genre: currentTrack.genre,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_artwork","require","_getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","artworkUrl","description","mediaId","getTrackIdentity","path","genre","
|
|
1
|
+
{"version":3,"names":["_artwork","require","_getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","getNowPlaying","undefined","title","artist","album","artwork","artworkSource","uri","artworkUrl","description","mediaId","getTrackIdentity","path","genre","clearNowPlayingOverride","exports"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAME,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,IAAI,IAAAC,mBAAU,EAACZ,YAAY,CAACS,OAAO,CAAC;MACrEI,WAAW,EAAEb,YAAY,CAACa,WAAW;MACrCC,OAAO,EAAE,IAAAC,kCAAgB,EAACf,YAAY,CAAC,IAAIA,YAAY,CAACgB,IAAI;MAC5DC,KAAK,EAAEjB,YAAY,CAACiB,KAAK;MACzBhB;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEiB,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAAChB,QAAQ,GAAGG,SAAS;EAC3B;AACF;AAACc,OAAA,CAAAvB,iBAAA,GAAAA,iBAAA","ignoreList":[]}
|
|
@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.BrowserPathHelper = void 0;
|
|
7
|
+
const isAbsoluteUrl = url => /^([a-z][a-z\d+.-]*:|\/\/)/i.test(url);
|
|
8
|
+
|
|
7
9
|
/**
|
|
8
10
|
* Utility for handling browser paths and contextual URLs in the media browser system.
|
|
9
11
|
* Mirrors Android's BrowserPathHelper.kt
|
|
@@ -166,15 +168,11 @@ const BrowserPathHelper = exports.BrowserPathHelper = {
|
|
|
166
168
|
* - buildUrl("http://example.com/", "/api/test") → "http://example.com/api/test"
|
|
167
169
|
* - buildUrl(undefined, "/api/test") → "/api/test"
|
|
168
170
|
* - buildUrl(undefined, "http://full.url") → "http://full.url"
|
|
171
|
+
* - buildUrl("http://example.com", "blob:http://app/id") → "blob:http://app/id"
|
|
172
|
+
* - buildUrl("http://example.com", "//cdn.example.com/a") → "//cdn.example.com/a"
|
|
169
173
|
*/
|
|
170
174
|
buildUrl(baseUrl, path) {
|
|
171
|
-
|
|
172
|
-
if (path.startsWith('http://') || path.startsWith('https://')) {
|
|
173
|
-
return path;
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
// If no baseUrl, return path as-is
|
|
177
|
-
if (!baseUrl) {
|
|
175
|
+
if (!baseUrl || isAbsoluteUrl(path)) {
|
|
178
176
|
return path;
|
|
179
177
|
}
|
|
180
178
|
|