@5stones/react-native-audio-browser 0.1.4 → 0.1.5
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/main/java/com/audiobrowser/player/MediaFactory.kt +11 -71
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +125 -0
- package/ios/Browser/BrowserManager.swift +17 -2
- package/ios/TrackPlayer.swift +150 -31
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/equalizer.js.map +1 -1
- package/lib/commonjs/features/errors.js.map +1 -1
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/metadata.js.map +1 -1
- package/lib/commonjs/features/nowPlaying.js.map +1 -1
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +1 -1
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/features/remoteControls.js.map +1 -1
- package/lib/commonjs/utils/useDebug.js.map +1 -1
- package/lib/commonjs/utils/validation.js +23 -0
- package/lib/commonjs/utils/validation.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +53 -15
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/SimpleRouter.js +5 -4
- package/lib/commonjs/web/SimpleRouter.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/Player.js +49 -24
- package/lib/commonjs/web/TrackPlayer/Player.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/PlaylistPlayer.js +54 -45
- package/lib/commonjs/web/TrackPlayer/PlaylistPlayer.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/State.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +10 -17
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/HttpClient.js +15 -2
- package/lib/commonjs/web/http/HttpClient.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +9 -0
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/player/OptionsManager.js +1 -1
- package/lib/commonjs/web/player/OptionsManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/equalizer.js.map +1 -1
- package/lib/module/features/errors.js.map +1 -1
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/metadata.js.map +1 -1
- package/lib/module/features/nowPlaying.js +1 -0
- package/lib/module/features/nowPlaying.js.map +1 -1
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +1 -1
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/features/remoteControls.js.map +1 -1
- package/lib/module/utils/useDebug.js.map +1 -1
- package/lib/module/utils/validation.js +18 -0
- package/lib/module/utils/validation.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +53 -15
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/SimpleRouter.js +5 -4
- package/lib/module/web/SimpleRouter.js.map +1 -1
- package/lib/module/web/TrackPlayer/Player.js +49 -24
- package/lib/module/web/TrackPlayer/Player.js.map +1 -1
- package/lib/module/web/TrackPlayer/PlaylistPlayer.js +54 -45
- package/lib/module/web/TrackPlayer/PlaylistPlayer.js.map +1 -1
- package/lib/module/web/TrackPlayer/State.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +10 -17
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/NavigationErrorManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/HttpClient.js +15 -2
- package/lib/module/web/http/HttpClient.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +9 -0
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/player/OptionsManager.js +1 -1
- package/lib/module/web/player/OptionsManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/equalizer.d.ts.map +1 -1
- package/lib/typescript/src/features/errors.d.ts.map +1 -1
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/metadata.d.ts +1 -1
- package/lib/typescript/src/features/metadata.d.ts.map +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts +1 -1
- package/lib/typescript/src/features/nowPlaying.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +1 -1
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +1 -1
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/features/remoteControls.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts.map +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts +1 -1
- package/lib/typescript/src/utils/useDebug.d.ts.map +1 -1
- package/lib/typescript/src/utils/validation.d.ts +3 -0
- package/lib/typescript/src/utils/validation.d.ts.map +1 -0
- package/lib/typescript/src/web/NativeAudioBrowser.d.ts +6 -1
- package/lib/typescript/src/web/NativeAudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/web/SimpleRouter.d.ts.map +1 -1
- package/lib/typescript/src/web/TrackPlayer/Player.d.ts +7 -19
- package/lib/typescript/src/web/TrackPlayer/Player.d.ts.map +1 -1
- package/lib/typescript/src/web/TrackPlayer/PlaylistPlayer.d.ts +3 -3
- package/lib/typescript/src/web/TrackPlayer/PlaylistPlayer.d.ts.map +1 -1
- package/lib/typescript/src/web/browser/BrowserManager.d.ts.map +1 -1
- package/lib/typescript/src/web/browser/FavoriteManager.d.ts.map +1 -1
- package/lib/typescript/src/web/browser/NavigationErrorManager.d.ts.map +1 -1
- package/lib/typescript/src/web/browser/SearchManager.d.ts +1 -1
- package/lib/typescript/src/web/browser/SearchManager.d.ts.map +1 -1
- package/lib/typescript/src/web/http/HttpClient.d.ts.map +1 -1
- package/lib/typescript/src/web/http/RequestConfigBuilder.d.ts.map +1 -1
- package/lib/typescript/src/web/player/NowPlayingManager.d.ts.map +1 -1
- package/lib/typescript/src/web/player/OptionsManager.d.ts.map +1 -1
- package/lib/typescript/src/web/util/BrowserPathHelper.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/browser.ts +1 -1
- package/src/features/equalizer.ts +1 -1
- package/src/features/errors.ts +1 -1
- package/src/features/favorites.ts +1 -1
- package/src/features/metadata.ts +1 -1
- package/src/features/nowPlaying.ts +1 -1
- package/src/features/output.ts +1 -1
- package/src/features/playback/state.ts +1 -1
- package/src/features/player/options.ts +2 -2
- package/src/features/queue/activeTrack.ts +1 -1
- package/src/features/queue/queue.ts +2 -2
- package/src/features/remoteControls.ts +2 -2
- package/src/specs/audio-browser.nitro.ts +0 -1
- package/src/utils/useDebug.ts +6 -6
- package/src/utils/validation.ts +27 -0
- package/src/web/NativeAudioBrowser.ts +137 -58
- package/src/web/SimpleRouter.ts +24 -9
- package/src/web/TrackPlayer/Player.ts +58 -30
- package/src/web/TrackPlayer/PlaylistPlayer.ts +72 -63
- package/src/web/TrackPlayer/RepeatMode.ts +1 -1
- package/src/web/TrackPlayer/State.ts +9 -9
- package/src/web/browser/BrowserManager.ts +124 -67
- package/src/web/browser/FavoriteManager.ts +5 -3
- package/src/web/browser/NavigationErrorManager.ts +15 -8
- package/src/web/browser/SearchManager.ts +17 -11
- package/src/web/http/HttpClient.ts +25 -7
- package/src/web/http/RequestConfigBuilder.ts +29 -13
- package/src/web/player/NowPlayingManager.ts +13 -7
- package/src/web/player/OptionsManager.ts +7 -6
- package/src/web/util/BrowserPathHelper.ts +3 -2
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { assertedNotNullish } from '../../utils/validation';
|
|
4
|
+
import { fisherYatesShuffle } from '../util/shuffle';
|
|
3
5
|
import { Player } from './Player';
|
|
4
|
-
import { State } from './State';
|
|
5
6
|
import { RepeatMode } from './RepeatMode';
|
|
6
|
-
import {
|
|
7
|
+
import { State } from './State';
|
|
7
8
|
export class PlaylistPlayer extends Player {
|
|
8
9
|
// TODO: use immer to make the `playlist` immutable
|
|
9
10
|
playlist = [];
|
|
@@ -12,6 +13,7 @@ export class PlaylistPlayer extends Player {
|
|
|
12
13
|
shuffleOrder = [];
|
|
13
14
|
onStateUpdate(state) {
|
|
14
15
|
super.onStateUpdate(state);
|
|
16
|
+
if (this._isStopped) return;
|
|
15
17
|
if (state === State.Ended) {
|
|
16
18
|
this.onTrackEnded();
|
|
17
19
|
}
|
|
@@ -50,17 +52,14 @@ export class PlaylistPlayer extends Player {
|
|
|
50
52
|
if (!track) return;
|
|
51
53
|
|
|
52
54
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
53
|
-
const
|
|
55
|
+
const onLoaded = _track => {
|
|
54
56
|
if (initialPosition !== undefined) {
|
|
55
57
|
this.seekTo(initialPosition);
|
|
56
58
|
}
|
|
57
|
-
if (this.playWhenReady) {
|
|
58
|
-
this.play();
|
|
59
|
-
}
|
|
60
59
|
};
|
|
61
60
|
if (this.currentIndex !== index) {
|
|
62
61
|
this.currentIndex = index;
|
|
63
|
-
this.load(track,
|
|
62
|
+
this.load(track, onLoaded);
|
|
64
63
|
} else {
|
|
65
64
|
// Replay the same track - seek to start (or initialPosition if specified)
|
|
66
65
|
this.seekTo(initialPosition ?? 0);
|
|
@@ -170,8 +169,8 @@ export class PlaylistPlayer extends Player {
|
|
|
170
169
|
// If there is a current track, move it to the beginning of the shuffle order
|
|
171
170
|
const currentPos = this.shuffleOrder.indexOf(this.currentIndex);
|
|
172
171
|
if (currentPos > 0) {
|
|
173
|
-
const temp = this.shuffleOrder[0];
|
|
174
|
-
this.shuffleOrder[0] = this.shuffleOrder[currentPos];
|
|
172
|
+
const temp = assertedNotNullish(this.shuffleOrder[0]);
|
|
173
|
+
this.shuffleOrder[0] = assertedNotNullish(this.shuffleOrder[currentPos]);
|
|
175
174
|
this.shuffleOrder[currentPos] = temp;
|
|
176
175
|
}
|
|
177
176
|
}
|
|
@@ -196,26 +195,39 @@ export class PlaylistPlayer extends Player {
|
|
|
196
195
|
return this.repeatMode;
|
|
197
196
|
}
|
|
198
197
|
remove(indexes) {
|
|
199
|
-
const
|
|
200
|
-
acc[elem] = true;
|
|
201
|
-
return acc;
|
|
202
|
-
}, {});
|
|
198
|
+
const idxSet = new Set(indexes);
|
|
203
199
|
let isCurrentRemoved = false;
|
|
200
|
+
let removedBeforeCurrent = 0;
|
|
204
201
|
this.playlist = this.playlist.filter((_track, idx) => {
|
|
205
|
-
const keep = !
|
|
206
|
-
if (!keep
|
|
207
|
-
|
|
202
|
+
const keep = !idxSet.has(idx);
|
|
203
|
+
if (!keep) {
|
|
204
|
+
if (idx === this.currentIndex) {
|
|
205
|
+
isCurrentRemoved = true;
|
|
206
|
+
} else if (this.currentIndex !== undefined && idx < this.currentIndex) {
|
|
207
|
+
removedBeforeCurrent++;
|
|
208
|
+
}
|
|
208
209
|
}
|
|
209
210
|
return keep;
|
|
210
211
|
});
|
|
211
212
|
if (this.currentIndex === undefined) {
|
|
212
213
|
return;
|
|
213
214
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
215
|
+
if (isCurrentRemoved) {
|
|
216
|
+
const hasItems = this.playlist.length > 0;
|
|
217
|
+
if (hasItems) {
|
|
218
|
+
// Adjust for removed items before current, then clamp to valid range
|
|
219
|
+
const adjustedIndex = this.currentIndex - removedBeforeCurrent;
|
|
220
|
+
// Reset so goToIndex always loads the new track at this position
|
|
221
|
+
this._currentIndex = undefined;
|
|
222
|
+
this.goToIndex(Math.min(adjustedIndex, this.playlist.length - 1));
|
|
223
|
+
} else {
|
|
224
|
+
this.current = undefined;
|
|
225
|
+
this._currentIndex = undefined;
|
|
226
|
+
this.stop();
|
|
227
|
+
}
|
|
228
|
+
} else {
|
|
229
|
+
// Adjust currentIndex to account for removed items before it
|
|
230
|
+
this._currentIndex = this.currentIndex - removedBeforeCurrent;
|
|
219
231
|
}
|
|
220
232
|
|
|
221
233
|
// Regenerate shuffle order when tracks are removed
|
|
@@ -224,15 +236,16 @@ export class PlaylistPlayer extends Player {
|
|
|
224
236
|
}
|
|
225
237
|
}
|
|
226
238
|
stop(onComplete) {
|
|
227
|
-
super.stop(
|
|
228
|
-
this.currentIndex = undefined;
|
|
229
|
-
onComplete?.();
|
|
230
|
-
});
|
|
239
|
+
super.stop(onComplete);
|
|
231
240
|
}
|
|
232
241
|
reset() {
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
242
|
+
// Clear queue state synchronously so subsequent add()/load() calls
|
|
243
|
+
// see a clean slate. The async player.unload() in stop() can finish
|
|
244
|
+
// in the background — it only releases the Shaka source.
|
|
245
|
+
this.playlist = [];
|
|
246
|
+
this.current = undefined;
|
|
247
|
+
this._currentIndex = undefined;
|
|
248
|
+
this.stop();
|
|
236
249
|
}
|
|
237
250
|
removeUpcomingTracks() {
|
|
238
251
|
if (this.currentIndex === undefined) return;
|
|
@@ -247,27 +260,23 @@ export class PlaylistPlayer extends Player {
|
|
|
247
260
|
if (!this.playlist[fromIndex]) {
|
|
248
261
|
throw new Error('index out of bounds');
|
|
249
262
|
}
|
|
250
|
-
if (this.currentIndex === fromIndex) {
|
|
251
|
-
throw new Error('you cannot move the currently playing track');
|
|
252
|
-
}
|
|
253
|
-
if (this.currentIndex === toIndex) {
|
|
254
|
-
throw new Error('you cannot replace the currently playing track');
|
|
255
|
-
}
|
|
256
263
|
|
|
257
|
-
//
|
|
258
|
-
let shift;
|
|
259
|
-
if (this.currentIndex !== undefined && fromIndex < this.currentIndex && toIndex > this.currentIndex) {
|
|
260
|
-
shift = -1;
|
|
261
|
-
} else if (this.currentIndex !== undefined && fromIndex > this.currentIndex && toIndex < this.currentIndex) {
|
|
262
|
-
shift = 1;
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
// move the track
|
|
264
|
+
// Move the track in the playlist
|
|
266
265
|
const fromItem = this.playlist[fromIndex];
|
|
267
266
|
this.playlist.splice(fromIndex, 1);
|
|
268
267
|
this.playlist.splice(toIndex, 0, fromItem);
|
|
269
|
-
|
|
270
|
-
|
|
268
|
+
|
|
269
|
+
// Update currentIndex to track the currently playing item's new position.
|
|
270
|
+
// Matches Android's exoPlayer.moveMediaItem() which has no restrictions.
|
|
271
|
+
if (this.currentIndex !== undefined) {
|
|
272
|
+
if (fromIndex === this.currentIndex) {
|
|
273
|
+
// Moving the current track — follow it to its new position
|
|
274
|
+
this._currentIndex = toIndex;
|
|
275
|
+
} else if (fromIndex < this.currentIndex && toIndex >= this.currentIndex) {
|
|
276
|
+
this._currentIndex = this.currentIndex - 1;
|
|
277
|
+
} else if (fromIndex > this.currentIndex && toIndex <= this.currentIndex) {
|
|
278
|
+
this._currentIndex = this.currentIndex + 1;
|
|
279
|
+
}
|
|
271
280
|
}
|
|
272
281
|
|
|
273
282
|
// Regenerate shuffle order when tracks are moved
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["assertedNotNullish","fisherYatesShuffle","Player","RepeatMode","State","PlaylistPlayer","playlist","repeatMode","Off","shuffleEnabled","shuffleOrder","onStateUpdate","state","_isStopped","Ended","onTrackEnded","Track","currentIndex","undefined","goToIndex","Playlist","skipToNext","getNextIndex","onPlaylistEnded","console","warn","_currentIndex","current","lastIndex","index","initialPosition","track","onLoaded","_track","seekTo","load","playWhenReady","play","add","tracks","insertBeforeIndex","splice","push","generateShuffleOrder","skip","Error","nextIndex","getWrapAroundFirstIndex","skipToPrevious","previousIndex","getPreviousIndex","getWrapAroundLastIndex","length","currentShufflePos","indexOf","nextShufflePos","prevIndex","previousShufflePos","Array","from","_","i","currentPos","temp","setShuffleEnabled","enabled","getShuffleEnabled","getTrack","setRepeatMode","mode","getRepeatMode","remove","indexes","idxSet","Set","isCurrentRemoved","removedBeforeCurrent","filter","idx","keep","has","hasItems","adjustedIndex","Math","min","stop","onComplete","reset","removeUpcomingTracks","slice","move","fromIndex","toIndex","fromItem"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/PlaylistPlayer.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["State","None","Ready","Playing","Paused","Stopped","Loading","Buffering","Error","Ended"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/State.ts"],"mappings":";;AAEA,OAAO,MAAMA,KAAK,GAAG;EACnBC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"names":["State","None","Ready","Playing","Paused","Stopped","Loading","Buffering","Error","Ended"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/State.ts"],"mappings":";;AAEA,OAAO,MAAMA,KAAK,GAAG;EACnBC,IAAI,EAAE,MAAM;EACZC,KAAK,EAAE,OAAO;EACdC,OAAO,EAAE,SAAS;EAClBC,MAAM,EAAE,QAAQ;EAChBC,OAAO,EAAE,SAAS;EAClBC,OAAO,EAAE,SAAS;EAClBC,SAAS,EAAE,WAAW;EACtBC,KAAK,EAAE,OAAO;EACdC,KAAK,EAAE;AACT,CAAyC","ignoreList":[]}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { assertedNotNullish } from '../../utils/validation';
|
|
4
4
|
import { RequestConfigBuilder } from '../http/RequestConfigBuilder';
|
|
5
|
+
import { SimpleRouter } from '../SimpleRouter';
|
|
5
6
|
import { BrowserPathHelper } from '../util/BrowserPathHelper';
|
|
6
7
|
|
|
7
8
|
/**
|
|
@@ -186,15 +187,10 @@ export class BrowserManager {
|
|
|
186
187
|
return;
|
|
187
188
|
}
|
|
188
189
|
|
|
189
|
-
//
|
|
190
|
-
//
|
|
191
|
-
//
|
|
192
|
-
//
|
|
193
|
-
// reach this block because it returns directly above. This matches Android's
|
|
194
|
-
// architecture where search() bypasses the resolve() contextual URL logic.
|
|
195
|
-
// IMPORTANT: Create a shallow copy to avoid mutating the original config object
|
|
196
|
-
// (e.g., browseStatic from routes). Without this, static route children would
|
|
197
|
-
// accumulate contextual URLs, breaking search which reads from the same source.
|
|
190
|
+
// Add contextual URLs to non-search content (matches Android behavior where
|
|
191
|
+
// search() bypasses the resolve() contextual URL logic).
|
|
192
|
+
// Shallow copy to avoid mutating the original config object (e.g., browseStatic
|
|
193
|
+
// from routes), which would break search that reads from the same source.
|
|
198
194
|
if (content?.children && !isSearchPath) {
|
|
199
195
|
content = {
|
|
200
196
|
...content,
|
|
@@ -253,10 +249,7 @@ export class BrowserManager {
|
|
|
253
249
|
console.error('Navigation failed:', error);
|
|
254
250
|
this._content = undefined;
|
|
255
251
|
this.onContentChanged(undefined);
|
|
256
|
-
|
|
257
|
-
// Set navigation error using helper
|
|
258
|
-
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
259
|
-
this.navigationErrorManager.setNavigationError('unknown-error', message);
|
|
252
|
+
this.handleNavigationError(error, path);
|
|
260
253
|
}
|
|
261
254
|
}
|
|
262
255
|
|
|
@@ -498,7 +491,7 @@ export class BrowserManager {
|
|
|
498
491
|
// Check singleTrack setting - if true, return only the selected track
|
|
499
492
|
if (this._configuration.singleTrack) {
|
|
500
493
|
return {
|
|
501
|
-
tracks: [playableTracks[selectedIndex]],
|
|
494
|
+
tracks: [assertedNotNullish(playableTracks[selectedIndex])],
|
|
502
495
|
selectedIndex: 0
|
|
503
496
|
};
|
|
504
497
|
}
|
|
@@ -526,13 +519,13 @@ export class BrowserManager {
|
|
|
526
519
|
async resolveMediaItemsForPlayback(tracks, startIndex, startPositionMs, searchQuery) {
|
|
527
520
|
// Single track: check for search context or contextual URL
|
|
528
521
|
if (tracks.length === 1) {
|
|
529
|
-
const track = tracks[0];
|
|
522
|
+
const track = assertedNotNullish(tracks[0]);
|
|
530
523
|
const trackUrl = track.url;
|
|
531
524
|
|
|
532
525
|
// If search query present, expand search results
|
|
533
526
|
if (searchQuery) {
|
|
534
527
|
// Execute search (will hit cache if already performed)
|
|
535
|
-
const searchResults = await this.
|
|
528
|
+
const searchResults = await this.resolveSearchContent(BrowserPathHelper.createSearchPath(searchQuery));
|
|
536
529
|
const searchTracks = searchResults?.children;
|
|
537
530
|
if (searchTracks && searchTracks.length > 0) {
|
|
538
531
|
// Find the selected track in search results
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SimpleRouter","RequestConfigBuilder","BrowserPathHelper","BrowserManager","_configuration","router","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","request","setBaseRequestConfig","initialPath","tabsRoute","routes","find","r","browseStatic","children","url","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","navigationId","undefined","isSearchPath","startsWith","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","map","src","contextualUrl","encodeURIComponent","hydrateChildren","transformArtworkForContent","queryTabs","Error","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","searchConfig","searchQueryParams","q","requestConfig","mergeRequestConfig","response","executeRequest","Array","isArray","title","artworkConfig","artwork","parentArtworkSource","resolveArtworkSourceAsync","transformedChildren","Promise","all","artworkSource","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","params","defaultRoute","transformTracksArtwork","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["assertedNotNullish","RequestConfigBuilder","SimpleRouter","BrowserPathHelper","BrowserManager","_configuration","router","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","request","setBaseRequestConfig","initialPath","tabsRoute","routes","find","r","browseStatic","children","url","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","navigationId","undefined","isSearchPath","startsWith","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","map","src","contextualUrl","encodeURIComponent","hydrateChildren","transformArtworkForContent","queryTabs","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","searchConfig","searchQueryParams","q","requestConfig","mergeRequestConfig","response","executeRequest","Array","isArray","title","artworkConfig","artwork","parentArtworkSource","resolveArtworkSourceAsync","transformedChildren","Promise","all","artworkSource","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","params","defaultRoute","transformTracksArtwork","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FavoriteManager","favorites","Set","setFavorites","isFavorited","src","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","track","favorited","undefined","size","hydrateChildren","resolvedTrack","children","hydratedChildren","map"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA,OAAO,MAAMA,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,GAAW,EAAW;IAChC,OAAO,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACD,GAAG,CAAC;EAChC;;EAEA;AACF;AACA;EACEE,WAAWA,CAACF,GAAW,EAAQ;IAC7B,IAAI,CAACJ,SAAS,CAACO,GAAG,CAACH,GAAG,CAAC;EACzB;;EAEA;AACF;AACA;EACEI,cAAcA,CAACJ,GAAW,EAAQ;IAChC,IAAI,CAACJ,SAAS,CAACS,MAAM,CAACL,GAAG,CAAC;EAC5B;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEM,eAAeA,CAACC,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACC,SAAS,KAAKC,SAAS,IAAIF,KAAK,CAACC,SAAS,KAAK,IAAI,EAAE,OAAOD,KAAK;IAC3E,IAAI,IAAI,CAACX,SAAS,CAACc,IAAI,KAAK,CAAC,EAAE,OAAOH,KAAK;IAE3C,MAAMR,WAAW,GAAGQ,KAAK,CAACP,GAAG,GAAG,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACM,KAAK,CAACP,GAAG,CAAC,GAAG,KAAK;IACrE,IAAI,CAACD,WAAW,EAAE,OAAOQ,KAAK;IAE9B,OAAO;MACL,GAAGA,KAAK;MACRC,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEG,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAMC,QAAQ,GAAGD,aAAa,CAACC,QAAQ;IACvC,IAAI,CAACA,QAAQ,EAAE,OAAOD,aAAa;IAEnC,MAAME,gBAAgB,GAAGD,QAAQ,CAACE,GAAG,
|
|
1
|
+
{"version":3,"names":["FavoriteManager","favorites","Set","setFavorites","isFavorited","src","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","track","favorited","undefined","size","hydrateChildren","resolvedTrack","children","hydratedChildren","map"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA,OAAO,MAAMA,eAAe,CAAC;EACnBC,SAAS,GAAG,IAAIC,GAAG,CAAS,CAAC;;EAErC;AACF;AACA;AACA;EACEC,YAAYA,CAACF,SAAmB,EAAQ;IACtC,IAAI,CAACA,SAAS,GAAG,IAAIC,GAAG,CAACD,SAAS,CAAC;EACrC;;EAEA;AACF;AACA;EACEG,WAAWA,CAACC,GAAW,EAAW;IAChC,OAAO,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACD,GAAG,CAAC;EAChC;;EAEA;AACF;AACA;EACEE,WAAWA,CAACF,GAAW,EAAQ;IAC7B,IAAI,CAACJ,SAAS,CAACO,GAAG,CAACH,GAAG,CAAC;EACzB;;EAEA;AACF;AACA;EACEI,cAAcA,CAACJ,GAAW,EAAQ;IAChC,IAAI,CAACJ,SAAS,CAACS,MAAM,CAACL,GAAG,CAAC;EAC5B;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEM,eAAeA,CAACC,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACC,SAAS,KAAKC,SAAS,IAAIF,KAAK,CAACC,SAAS,KAAK,IAAI,EAAE,OAAOD,KAAK;IAC3E,IAAI,IAAI,CAACX,SAAS,CAACc,IAAI,KAAK,CAAC,EAAE,OAAOH,KAAK;IAE3C,MAAMR,WAAW,GAAGQ,KAAK,CAACP,GAAG,GAAG,IAAI,CAACJ,SAAS,CAACK,GAAG,CAACM,KAAK,CAACP,GAAG,CAAC,GAAG,KAAK;IACrE,IAAI,CAACD,WAAW,EAAE,OAAOQ,KAAK;IAE9B,OAAO;MACL,GAAGA,KAAK;MACRC,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEG,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAMC,QAAQ,GAAGD,aAAa,CAACC,QAAQ;IACvC,IAAI,CAACA,QAAQ,EAAE,OAAOD,aAAa;IAEnC,MAAME,gBAAgB,GAAGD,QAAQ,CAACE,GAAG,CAAER,KAAK,IAC1C,IAAI,CAACD,eAAe,CAACC,KAAK,CAC5B,CAAC;IACD,OAAO;MACL,GAAGK,aAAa;MAChBC,QAAQ,EAAEC;IACZ,CAAC;EACH;AACF","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","console","getNavigationError","getFormattedNavigationError"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;AAQA,MAAMA,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE;AACnB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,
|
|
1
|
+
{"version":3,"names":["ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","console","getNavigationError","getFormattedNavigationError"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;AAQA,MAAMA,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE;AACnB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ;QACF,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACdW,OAAO,CAACX,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEa,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAACf,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEgB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAACd,yBAAyB;EACvC;AACF","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RequestConfigBuilder","SearchManager","constructor","browserManager","httpClient","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","genre","artist","album","title","playlist","requestConfig","mergeRequestConfig","response","executeRequest","Array","isArray","error","console","artworkConfig","artwork","Promise","all","map","track","artworkSource","resolveArtworkSourceAsync"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;AAGA,SAASA,oBAAoB,QAAQ,8BAA8B;;AAEnE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CACDC,cAA8B,EAC9BC,UAAsB,EAC9B;IAAA,KAFQD,cAA8B,GAA9BA,cAA8B;IAAA,KAC9BC,UAAsB,GAAtBA,UAAsB;EAC7B;;EAEH;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACJ,cAAc,CAACK,aAAa,CAACC,MAAM,EAAEC,IAAI,
|
|
1
|
+
{"version":3,"names":["RequestConfigBuilder","SearchManager","constructor","browserManager","httpClient","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","genre","artist","album","title","playlist","requestConfig","mergeRequestConfig","response","executeRequest","Array","isArray","error","console","artworkConfig","artwork","Promise","all","map","track","artworkSource","resolveArtworkSourceAsync"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;AAGA,SAASA,oBAAoB,QAAQ,8BAA8B;;AAEnE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CACDC,cAA8B,EAC9BC,UAAsB,EAC9B;IAAA,KAFQD,cAA8B,GAA9BA,cAA8B;IAAA,KAC9BC,UAAsB,GAAtBA,UAAsB;EAC7B;;EAEH;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACJ,cAAc,CAACK,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,KAAK,EAAEJ,iBAAiB,CAACI,KAAK,GAAGd,MAAM,CAACc,KAAK;MACxD,IAAId,MAAM,CAACe,MAAM,EAAEL,iBAAiB,CAACK,MAAM,GAAGf,MAAM,CAACe,MAAM;MAC3D,IAAIf,MAAM,CAACgB,KAAK,EAAEN,iBAAiB,CAACM,KAAK,GAAGhB,MAAM,CAACgB,KAAK;MACxD,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,QAAQ,EAAER,iBAAiB,CAACQ,QAAQ,GAAGlB,MAAM,CAACkB,QAAQ;MAEjE,MAAMC,aAAa,GAAG,IAAI,CAACrB,UAAU,CAACsB,kBAAkB,CACtDnB,WAAW,CAACQ,YAAY,EACxB;QACEG,KAAK,EAAEF;MACT,CACF,CAAC;MAED,IAAI;QACF,MAAMW,QAAQ,GAAG,MAAM,IAAI,CAACvB,UAAU,CAACwB,cAAc,CAACH,aAAa,CAAC;QACpEZ,OAAO,GAAGgB,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,GAAIA,QAAQ,GAAe,EAAE;MAChE,CAAC,CAAC,OAAOI,KAAK,EAAE;QACdC,OAAO,CAACD,KAAK,CAAC,gBAAgB,EAAEA,KAAK,CAAC;QACtC,OAAO,EAAE;MACX;IACF;;IAEA;IACA,MAAME,aAAa,GAAG,IAAI,CAAC9B,cAAc,CAACK,aAAa,CAAC0B,OAAO;IAC/D,IAAID,aAAa,EAAE;MACjBpB,OAAO,GAAG,MAAMsB,OAAO,CAACC,GAAG,CACzBvB,OAAO,CAACwB,GAAG,CAAC,MAAOC,KAAK,IAAK;QAC3B,MAAMC,aAAa,GACjB,MAAMvC,oBAAoB,CAACwC,yBAAyB,CAClDF,KAAK,EACLL,aACF,CAAC;QACH,IAAIM,aAAa,IAAI,CAACD,KAAK,CAACC,aAAa,EAAE;UACzC,OAAO;YAAE,GAAGD,KAAK;YAAEC;UAAc,CAAC;QACpC;QACA,OAAOD,KAAK;MACd,CAAC,CACH,CAAC;IACH;IAEA,OAAOzB,OAAO;EAChB;AACF","ignoreList":[]}
|
|
@@ -4,6 +4,7 @@ import { RequestConfigBuilder } from './RequestConfigBuilder';
|
|
|
4
4
|
function isHttpError(error) {
|
|
5
5
|
return error instanceof Error && 'isHttpError' in error && error.isHttpError === true && typeof error.status === 'number' && typeof error.statusText === 'string';
|
|
6
6
|
}
|
|
7
|
+
const TIMEOUT_MS = 30_000;
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* HTTP client for making browser API requests.
|
|
@@ -42,10 +43,13 @@ export class HttpClient {
|
|
|
42
43
|
const url = RequestConfigBuilder.buildUrl(config);
|
|
43
44
|
const headers = config.headers ?? {};
|
|
44
45
|
const method = config.method ?? 'GET';
|
|
46
|
+
const controller = new AbortController();
|
|
47
|
+
const timeoutId = setTimeout(() => controller.abort(), TIMEOUT_MS);
|
|
45
48
|
try {
|
|
46
49
|
const response = await fetch(url, {
|
|
47
50
|
method,
|
|
48
|
-
headers
|
|
51
|
+
headers,
|
|
52
|
+
signal: controller.signal
|
|
49
53
|
});
|
|
50
54
|
if (!response.ok) {
|
|
51
55
|
const error = new Error(`HTTP ${response.status}: ${response.statusText}`);
|
|
@@ -54,8 +58,15 @@ export class HttpClient {
|
|
|
54
58
|
error.statusText = response.statusText;
|
|
55
59
|
throw error;
|
|
56
60
|
}
|
|
57
|
-
|
|
61
|
+
|
|
62
|
+
// await so JSON parse errors are caught by the surrounding try/catch
|
|
63
|
+
return await response.json();
|
|
58
64
|
} catch (error) {
|
|
65
|
+
if (error instanceof DOMException && error.name === 'AbortError') {
|
|
66
|
+
const navError = new Error(`Request timed out after ${TIMEOUT_MS}ms`);
|
|
67
|
+
navError.code = 'network-error';
|
|
68
|
+
throw navError;
|
|
69
|
+
}
|
|
59
70
|
// Distinguish between network errors and HTTP errors
|
|
60
71
|
if (isHttpError(error)) {
|
|
61
72
|
const navError = new Error(error.message);
|
|
@@ -70,6 +81,8 @@ export class HttpClient {
|
|
|
70
81
|
const navError = new Error(message);
|
|
71
82
|
navError.code = 'network-error';
|
|
72
83
|
throw navError;
|
|
84
|
+
} finally {
|
|
85
|
+
clearTimeout(timeoutId);
|
|
73
86
|
}
|
|
74
87
|
}
|
|
75
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RequestConfigBuilder","isHttpError","error","Error","status","statusText","HttpClient","constructor","baseRequestConfig","setBaseRequestConfig","config","mergeRequestConfig","base","overrides","withBase","mergeConfig","executeRequest","url","buildUrl","headers","method","response","fetch","ok","json","
|
|
1
|
+
{"version":3,"names":["RequestConfigBuilder","isHttpError","error","Error","status","statusText","TIMEOUT_MS","HttpClient","constructor","baseRequestConfig","setBaseRequestConfig","config","mergeRequestConfig","base","overrides","withBase","mergeConfig","executeRequest","url","buildUrl","headers","method","controller","AbortController","timeoutId","setTimeout","abort","response","fetch","signal","ok","json","DOMException","name","navError","code","message","statusCode","console","clearTimeout"],"sourceRoot":"../../../../src","sources":["web/http/HttpClient.ts"],"mappings":";;AAEA,SAASA,oBAAoB,QAAQ,wBAAwB;AAQ7D,SAASC,WAAWA,CAACC,KAAc,EAAsB;EACvD,OACEA,KAAK,YAAYC,KAAK,IACtB,aAAa,IAAID,KAAK,IACrBA,KAAK,CAAeD,WAAW,KAAK,IAAI,IACzC,OAAQC,KAAK,CAAeE,MAAM,KAAK,QAAQ,IAC/C,OAAQF,KAAK,CAAeG,UAAU,KAAK,QAAQ;AAEvD;AAEA,MAAMC,UAAU,GAAG,MAAM;;AAEzB;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,CAAC;EAGtBC,WAAWA,CAACC,iBAAsD,GAAG,CAAC,CAAC,EAAE;IACvE,IAAI,CAACA,iBAAiB,GAAGA,iBAAiB;EAC5C;;EAEA;AACF;AACA;EACEC,oBAAoBA,CAACC,MAA2C,EAAQ;IACtE,IAAI,CAACF,iBAAiB,GAAGE,MAAM;EACjC;;EAEA;AACF;AACA;AACA;EACEC,kBAAkBA,CAChBC,IAAyC,EACzCC,SAAiC,EAClB;IACf;IACA,MAAMC,QAAQ,GAAGf,oBAAoB,CAACgB,WAAW,CAC/C,IAAI,CAACP,iBAAiB,EACtBI,IACF,CAAC;IACD;IACA,OAAOb,oBAAoB,CAACgB,WAAW,CACrCD,QAAQ,EACRD,SACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACE,MAAMG,cAAcA,CAACN,MAAqB,EAAoB;IAC5D;IACA,MAAMO,GAAG,GAAGlB,oBAAoB,CAACmB,QAAQ,CAACR,MAAM,CAAC;IACjD,MAAMS,OAAO,GAAGT,MAAM,CAACS,OAAO,IAAI,CAAC,CAAC;IACpC,MAAMC,MAAM,GAAGV,MAAM,CAACU,MAAM,IAAI,KAAK;IAErC,MAAMC,UAAU,GAAG,IAAIC,eAAe,CAAC,CAAC;IACxC,MAAMC,SAAS,GAAGC,UAAU,CAAC,MAAMH,UAAU,CAACI,KAAK,CAAC,CAAC,EAAEpB,UAAU,CAAC;IAElE,IAAI;MACF,MAAMqB,QAAQ,GAAG,MAAMC,KAAK,CAACV,GAAG,EAAE;QAChCG,MAAM;QACND,OAAO;QACPS,MAAM,EAAEP,UAAU,CAACO;MACrB,CAAC,CAAC;MAEF,IAAI,CAACF,QAAQ,CAACG,EAAE,EAAE;QAChB,MAAM5B,KAAK,GAAG,IAAIC,KAAK,CACrB,QAAQwB,QAAQ,CAACvB,MAAM,KAAKuB,QAAQ,CAACtB,UAAU,EACjD,CAAc;QACdH,KAAK,CAACD,WAAW,GAAG,IAAI;QACxBC,KAAK,CAACE,MAAM,GAAGuB,QAAQ,CAACvB,MAAM;QAC9BF,KAAK,CAACG,UAAU,GAAGsB,QAAQ,CAACtB,UAAU;QACtC,MAAMH,KAAK;MACb;;MAEA;MACA,OAAO,MAAMyB,QAAQ,CAACI,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,OAAO7B,KAAc,EAAE;MACvB,IAAIA,KAAK,YAAY8B,YAAY,IAAI9B,KAAK,CAAC+B,IAAI,KAAK,YAAY,EAAE;QAChE,MAAMC,QAAQ,GAAG,IAAI/B,KAAK,CACxB,2BAA2BG,UAAU,IACvC,CAA0C;QAC1C4B,QAAQ,CAACC,IAAI,GAAG,eAAe;QAC/B,MAAMD,QAAQ;MAChB;MACA;MACA,IAAIjC,WAAW,CAACC,KAAK,CAAC,EAAE;QACtB,MAAMgC,QAAQ,GAAG,IAAI/B,KAAK,CAACD,KAAK,CAACkC,OAAO,CAGvC;QACDF,QAAQ,CAACC,IAAI,GAAG,YAAY;QAC5BD,QAAQ,CAACG,UAAU,GAAGnC,KAAK,CAACE,MAAM;QAClC,MAAM8B,QAAQ;MAChB;;MAEA;MACA,MAAME,OAAO,GAAGlC,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACkC,OAAO,GAAG,iBAAiB;MAC1EE,OAAO,CAACpC,KAAK,CAAC,0BAA0BgB,GAAG,GAAG,EAAEhB,KAAK,CAAC;MACtD,MAAMgC,QAAQ,GAAG,IAAI/B,KAAK,CAACiC,OAAO,CAEjC;MACDF,QAAQ,CAACC,IAAI,GAAG,eAAe;MAC/B,MAAMD,QAAQ;IAChB,CAAC,SAAS;MACRK,YAAY,CAACf,SAAS,CAAC;IACzB;EACF;AACF","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["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","RequestConfigBuilder","buildUrl","path","baseUrl","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","mergeMediaConfig","transform","transformed","e","console","error","toRequestConfig","mergeArtworkConfig","resolveMediaUrl","src","mediaConfig","resolveArtworkSource","artworkUrl","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","track","imageContext","artwork","resolvedConfig","resolve","baseConfig","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource","transformTracksArtwork","tracks","map"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["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","RequestConfigBuilder","buildUrl","path","baseUrl","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","mergeMediaConfig","transform","transformed","e","console","error","toRequestConfig","mergeArtworkConfig","resolveMediaUrl","src","mediaConfig","resolveArtworkSource","artworkUrl","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","track","imageContext","artwork","resolvedConfig","resolve","baseConfig","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource","transformTracksArtwork","tracks","map"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -25,12 +25,18 @@ export class NowPlayingManager {
|
|
|
25
25
|
artist: update.artist ?? currentTrack.artist,
|
|
26
26
|
album: currentTrack.album,
|
|
27
27
|
artwork: currentTrack.artwork,
|
|
28
|
+
description: currentTrack.description,
|
|
29
|
+
mediaId: currentTrack.src ?? currentTrack.url,
|
|
30
|
+
genre: currentTrack.genre,
|
|
28
31
|
duration
|
|
29
32
|
} : {
|
|
30
33
|
title: currentTrack.title,
|
|
31
34
|
artist: currentTrack.artist,
|
|
32
35
|
album: currentTrack.album,
|
|
33
36
|
artwork: currentTrack.artwork,
|
|
37
|
+
description: currentTrack.description,
|
|
38
|
+
mediaId: currentTrack.src ?? currentTrack.url,
|
|
39
|
+
genre: currentTrack.genre,
|
|
34
40
|
duration
|
|
35
41
|
};
|
|
36
42
|
this.onNowPlayingChanged(metadata);
|
|
@@ -50,6 +56,9 @@ export class NowPlayingManager {
|
|
|
50
56
|
artist: this.override?.artist ?? currentTrack.artist,
|
|
51
57
|
album: currentTrack.album,
|
|
52
58
|
artwork: currentTrack.artwork,
|
|
59
|
+
description: currentTrack.description,
|
|
60
|
+
mediaId: currentTrack.src ?? currentTrack.url,
|
|
61
|
+
genre: currentTrack.genre,
|
|
53
62
|
duration
|
|
54
63
|
};
|
|
55
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","getNowPlaying","undefined","clearNowPlayingOverride"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;
|
|
1
|
+
{"version":3,"names":["NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","description","mediaId","src","url","genre","getNowPlaying","undefined","clearNowPlayingOverride"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;AAGA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,iBAAiB,CAAC;EAG7B;EACAC,mBAAmB,GAA2CA,CAAA,KAAM,CAAC,CAAC;;EAEtE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgBA,CACdC,MAAoC,EACpCC,YAA+B,EAC/BC,QAAgB,EACV;IACN,IAAI,CAACC,QAAQ,GAAGH,MAAM;IAEtB,IAAI,CAACC,YAAY,EAAE;IAEnB,MAAMG,QAA4B,GAAGJ,MAAM,GACvC;MACEK,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACzCC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAIL,YAAY,CAACK,MAAM;MAC5CC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAEP,YAAY,CAACO,OAAO;MAC7BC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAET,YAAY,CAACU,GAAG,IAAIV,YAAY,CAACW,GAAG;MAC7CC,KAAK,EAAEZ,YAAY,CAACY,KAAK;MACzBX;IACF,CAAC,GACD;MACEG,KAAK,EAAEJ,YAAY,CAACI,KAAK;MACzBC,MAAM,EAAEL,YAAY,CAACK,MAAM;MAC3BC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAEP,YAAY,CAACO,OAAO;MAC7BC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAET,YAAY,CAACU,GAAG,IAAIV,YAAY,CAACW,GAAG;MAC7CC,KAAK,EAAEZ,YAAY,CAACY,KAAK;MACzBX;IACF,CAAC;IAEL,IAAI,CAACJ,mBAAmB,CAACM,QAAQ,CAAC;EACpC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEU,aAAaA,CACXb,YAA+B,EAC/BC,QAAgB,EACgB;IAChC,IAAI,CAACD,YAAY,EAAE,OAAOc,SAAS;IAEnC,OAAO;MACLV,KAAK,EAAE,IAAI,CAACF,QAAQ,EAAEE,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACjDC,MAAM,EAAE,IAAI,CAACH,QAAQ,EAAEG,MAAM,IAAIL,YAAY,CAACK,MAAM;MACpDC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAEP,YAAY,CAACO,OAAO;MAC7BC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAET,YAAY,CAACU,GAAG,IAAIV,YAAY,CAACW,GAAG;MAC7CC,KAAK,EAAEZ,YAAY,CAACY,KAAK;MACzBX;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEc,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAACb,QAAQ,GAAGY,SAAS;EAC3B;AACF","ignoreList":[]}
|
|
@@ -25,7 +25,7 @@ export class OptionsManager {
|
|
|
25
25
|
*/
|
|
26
26
|
updateOptions(options) {
|
|
27
27
|
if (options.progressUpdateEventInterval !== null && options.progressUpdateEventInterval !== undefined && typeof options.progressUpdateEventInterval !== 'number') {
|
|
28
|
-
throw new Error('
|
|
28
|
+
throw new Error('NullSentinel type is not valid on web.');
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
// Merge platform-agnostic options
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["RepeatMode","OptionsManager","options","forwardJumpInterval","backwardJumpInterval","progressUpdateEventInterval","repeatMode","Off","capabilities","onOptionsChanged","updateOptions","undefined","Error","mergedOptions","fullOptions","getOptions","getRepeatMode","setRepeatMode","mode"],"sourceRoot":"../../../../src","sources":["web/player/OptionsManager.ts"],"mappings":";;AAMA,SAASA,UAAU,QAAQ,gBAAgB;AAM3C;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,CAAC;EAClBC,OAAO,GAAoB;IACjCC,mBAAmB,EAAE,EAAE;IACvBC,oBAAoB,EAAE,EAAE;IACxBC,2BAA2B,EAAE,IAAI;IACjCC,UAAU,EAAEN,UAAU,CAACO,GAAG;IAC1BC,YAAY,EAAE,CAAC;EACjB,CAAC;;EAED;EACAC,gBAAgB,GAA+BA,CAAA,KAAM,CAAC,CAAC;;EAEvD;AACF;AACA;AACA;AACA;AACA;EACEC,aAAaA,CAACR,OAA4B,EAAQ;IAChD,IACEA,OAAO,CAACG,2BAA2B,KAAK,IAAI,IAC5CH,OAAO,CAACG,2BAA2B,KAAKM,SAAS,IACjD,OAAOT,OAAO,CAACG,2BAA2B,KAAK,QAAQ,EACvD;MACA,MAAM,IAAIO,KAAK,CAAC,wCAAwC,CAAC;IAC3D;;IAEA;IACA,MAAMC,aAA8B,GAAG;MACrC,GAAG,IAAI,CAACX,OAAO;MACfC,mBAAmB,EACjBD,OAAO,CAACC,mBAAmB,IAAI,IAAI,CAACD,OAAO,CAACC,mBAAmB;MACjEC,oBAAoB,EAClBF,OAAO,CAACE,oBAAoB,IAAI,IAAI,CAACF,OAAO,CAACE,oBAAoB;MACnEI,YAAY,EAAEN,OAAO,CAACM,YAAY,IAAI,IAAI,CAACN,OAAO,CAACM,YAAY;MAC/DH,2BAA2B,EACzBH,OAAO,CAACG,2BAA2B,KAAK,IAAI,GACxC,IAAI,GACHH,OAAO,CAACG,2BAA2B,
|
|
1
|
+
{"version":3,"names":["RepeatMode","OptionsManager","options","forwardJumpInterval","backwardJumpInterval","progressUpdateEventInterval","repeatMode","Off","capabilities","onOptionsChanged","updateOptions","undefined","Error","mergedOptions","fullOptions","getOptions","getRepeatMode","setRepeatMode","mode"],"sourceRoot":"../../../../src","sources":["web/player/OptionsManager.ts"],"mappings":";;AAMA,SAASA,UAAU,QAAQ,gBAAgB;AAM3C;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,CAAC;EAClBC,OAAO,GAAoB;IACjCC,mBAAmB,EAAE,EAAE;IACvBC,oBAAoB,EAAE,EAAE;IACxBC,2BAA2B,EAAE,IAAI;IACjCC,UAAU,EAAEN,UAAU,CAACO,GAAG;IAC1BC,YAAY,EAAE,CAAC;EACjB,CAAC;;EAED;EACAC,gBAAgB,GAA+BA,CAAA,KAAM,CAAC,CAAC;;EAEvD;AACF;AACA;AACA;AACA;AACA;EACEC,aAAaA,CAACR,OAA4B,EAAQ;IAChD,IACEA,OAAO,CAACG,2BAA2B,KAAK,IAAI,IAC5CH,OAAO,CAACG,2BAA2B,KAAKM,SAAS,IACjD,OAAOT,OAAO,CAACG,2BAA2B,KAAK,QAAQ,EACvD;MACA,MAAM,IAAIO,KAAK,CAAC,wCAAwC,CAAC;IAC3D;;IAEA;IACA,MAAMC,aAA8B,GAAG;MACrC,GAAG,IAAI,CAACX,OAAO;MACfC,mBAAmB,EACjBD,OAAO,CAACC,mBAAmB,IAAI,IAAI,CAACD,OAAO,CAACC,mBAAmB;MACjEC,oBAAoB,EAClBF,OAAO,CAACE,oBAAoB,IAAI,IAAI,CAACF,OAAO,CAACE,oBAAoB;MACnEI,YAAY,EAAEN,OAAO,CAACM,YAAY,IAAI,IAAI,CAACN,OAAO,CAACM,YAAY;MAC/DH,2BAA2B,EACzBH,OAAO,CAACG,2BAA2B,KAAK,IAAI,GACxC,IAAI,GACHH,OAAO,CAACG,2BAA2B,IACpC,IAAI,CAACH,OAAO,CAACG;IACrB,CAAC;;IAED;IACA,IAAI,CAACH,OAAO,GAAGW,aAAa;;IAE5B;IACA,MAAMC,WAAoB,GAAG;MAC3BX,mBAAmB,EAAEU,aAAa,CAACV,mBAAmB,IAAI,EAAE;MAC5DC,oBAAoB,EAAES,aAAa,CAACT,oBAAoB,IAAI,EAAE;MAC9DC,2BAA2B,EACzBQ,aAAa,CAACR,2BAA2B,IAAI,EAAE;MACjDG,YAAY,EAAEK,aAAa,CAACL,YAAY,IAAI,CAAC,CAAC;MAC9CF,UAAU,EAAEO,aAAa,CAACP;IAC5B,CAAC;IACD,IAAI,CAACG,gBAAgB,CAACK,WAAW,CAAC;EACpC;;EAEA;AACF;AACA;EACEC,UAAUA,CAAA,EAAkB;IAC1B,OAAO;MACLZ,mBAAmB,EAAE,IAAI,CAACD,OAAO,CAACC,mBAAmB;MACrDC,oBAAoB,EAAE,IAAI,CAACF,OAAO,CAACE,oBAAoB;MACvDC,2BAA2B,EAAE,IAAI,CAACH,OAAO,CAACG,2BAA2B;MACrEG,YAAY,EAAE,IAAI,CAACN,OAAO,CAACM;IAC7B,CAAC;EACH;;EAEA;AACF;AACA;EACEQ,aAAaA,CAAA,EAAmB;IAC9B,OAAO,IAAI,CAACd,OAAO,CAACI,UAAU;EAChC;;EAEA;AACF;AACA;AACA;AACA;AACA;EACEW,aAAaA,CAACC,IAAoB,EAAQ;IACxC,IAAI,CAAChB,OAAO,CAACI,UAAU,GAAGY,IAAI;EAChC;AACF","ignoreList":[]}
|