react-native-audio-browser 0.2.0-next.17 → 0.2.0-next.19

package/lib/module/web/TrackPlayer/Player.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { playbackErrorKind } from '../playbackErrorKind';
+import { LoadAttempt } from './LoadAttempt';
 import { nextPlaybackState } from './PlaybackStateMachine';
 import { SetupNotCalledError } from './SetupNotCalledError';
 import { State } from './State';
@@ -9,6 +10,15 @@ import { State } from './State';
 
 // Shaka event type definitions
 
+/** Per-load overrides that don't belong on the track itself. */
+
+/** The mutable request Shaka hands to a networking-engine request filter. */
+
+/**
+ * `shaka.util.Error.Code.LOAD_INTERRUPTED`. Inlined because shaka is imported
+ * for types only here, as the codes in `playbackErrorKind.ts` are.
+ */
+const LOAD_INTERRUPTED = 7000;
 export class Player {
   hasInitialized = false;
   _current = undefined;
@@ -18,6 +28,13 @@ export class Player {
   };
   _isStopped = false;
   _loadInProgress = false;
+
+  /**
+   * Headers for the track currently loaded, applied by the request filter
+   * installed in `setupPlayer`. On the instance rather than per request so the
+   * manifest, its segments and any key requests all carry them.
+   */
+
   // current getter/setter
   get current() {
     return this._current;
@@ -91,6 +108,18 @@ export class Player {
     await player.attach(element);
     this.player = player;
 
+    // Apply the media config's headers to Shaka's requests, as native does to
+    // the AVURLAsset / ExoPlayer DataSpec. Without this they resolve and are
+    // then dropped, and authenticated media 401s on web alone.
+    player.getNetworkingEngine()?.registerRequestFilter((_type, request) => {
+      const headers = this.mediaHeaders;
+      if (!headers) return;
+      request.headers = {
+        ...request.headers,
+        ...headers
+      };
+    });
+
     // Listen for relevant events
     player.addEventListener('error', event => {
       const errorEvent = event;
@@ -102,22 +131,39 @@ export class Player {
     element.addEventListener('playing', () => this.dispatch({
       type: 'playing'
     }));
-    element.addEventListener('pause', () => this.dispatch({
-      type: 'paused',
-      hasAsset: this.current !== undefined
-    }));
-    player.addEventListener('loading', () => this.dispatch({
-      type: 'trackLoading'
-    }));
+    element.addEventListener('pause', () => {
+      // A track playing out fires `pause` and then `ended`. Only the `ended`
+      // is meaningful — reporting `paused` first flashes a state Android never
+      // reports, mid-queue or at the true end.
+      if (element.ended) return;
+      this.dispatch({
+        type: 'paused',
+        hasAsset: this.current !== undefined
+      });
+    });
+    player.addEventListener('loading', () => {
+      this.dispatch({
+        type: 'trackLoading'
+      });
+      // Every load passes through `buffering`, as ExoPlayer's always does via
+      // STATE_BUFFERING. Shaka only fires its own `buffering` event when a load
+      // actually stalls, so a load served from cache would otherwise skip a
+      // state native always reports.
+      this.dispatch({
+        type: 'waiting'
+      });
+    });
     player.addEventListener('loaded', () => this.dispatch({
-      type: 'loadSeekCompleted'
+      type: 'loadSeekCompleted',
+      playWhenReady: this.playWhenReady
     }));
     player.addEventListener('buffering', event => {
       const bufferingEvent = event;
       this.dispatch(bufferingEvent.detail.buffering === true ? {
         type: 'waiting'
       } : {
-        type: 'bufferingSufficient'
+        type: 'bufferingSufficient',
+        playWhenReady: this.playWhenReady
       });
     });
 
@@ -168,6 +214,24 @@ export class Player {
     };
   }
   onError(shakaError) {
+    // An interrupted load is not a failure. Shaka raises it when a `load()` is
+    // cut short by a newer `load()` or an `unload()` — always something we
+    // asked for — and names it accordingly: `createAbortLoadError_()`. Its own
+    // code skips its cleanup unload for this code too (player.js:2010).
+    //
+    // Recognising it here rather than pre-emptively invalidating the load keeps
+    // the two independent: any teardown, in any order, can abort a load without
+    // the abort reaching a consumer as an error. Eagerly unloading to stop the
+    // outgoing track used to flash an error banner on every fast track switch.
+    if (shakaError.code === LOAD_INTERRUPTED) {
+      console.debug('Load interrupted by a newer load or an unload');
+      return;
+    }
+
+    // Before the unload below resets it: a retry resumes from where playback
+    // failed, as native does.
+    this.rememberResumePosition();
+
     // unload the current track to allow for clean playback on other
     this.player?.unload().catch(err => {
       console.error(`Error unloading player on 'onError'`, err);
@@ -191,16 +255,49 @@ export class Player {
     console.debug('Error code', shakaError.code, 'object', shakaError);
   }
 
-  /** Invalidates the .then/.catch of superseded loads — a Shaka load
-   * interrupted by stop() or a newer load() rejects, and only the active load
-   * may surface that (or run its onLoaded side effects). */
-  _loadGeneration = 0;
-  load(track, onLoaded) {
+  /**
+   * The load attempt that owns the player, or none. See {@link LoadAttempt}.
+   */
+
+  /**
+   * Starts an attempt, superseding whatever was in flight.
+   *
+   * Called by the outermost `load()` so supersession is registered when the
+   * caller asks for it, not when some inner stage happens to reach it.
+   */
+  beginLoadAttempt() {
+    this._attempt?.cancel();
+    const attempt = new LoadAttempt();
+    this._attempt = attempt;
+    return attempt;
+  }
+
+  /** Abandons the attempt in flight without starting another — `stop()`. */
+  cancelLoadAttempt() {
+    this._attempt?.cancel();
+    this._attempt = undefined;
+  }
+  load(track, onLoaded, options) {
     const player = this.requirePlayer();
     this._isStopped = false;
     this._loadInProgress = true;
-    const generation = ++this._loadGeneration;
-    if (!track.src) {
+    const headers = options?.headers;
+    this.mediaHeaders = headers && Object.keys(headers).length > 0 ? headers : undefined;
+    // What Shaka plays may differ from what the caller queued; `track` is left
+    // alone so `current` and `getActiveTrack()` keep the caller's identity for
+    // it rather than a transport detail.
+    const playbackSrc = options?.src ?? track.src;
+    // Current on the attempt, not on success — native derives the active track
+    // from the queue, so a failed load is still the active track there and its
+    // error has somewhere to show. `getActiveTrackIndex()` already reported the
+    // queue's index either way; this makes the pair agree.
+    this.current = track;
+    // The attempt a subclass began before resolving the URL, so its resolution
+    // stage and both continuations below share one token. Passed rather than
+    // read off the instance: a direct `load()` is itself the outermost call and
+    // must start a fresh attempt, superseding whatever was in flight.
+    const attempt = options?.attempt ?? this.beginLoadAttempt();
+    if (!playbackSrc) {
       this._loadInProgress = false;
       this._pendingSeek = undefined;
       const error = {
@@ -214,10 +311,9 @@ export class Player {
       };
       return;
     }
-    player.load(track.src).then(() => {
-      if (generation !== this._loadGeneration || this._isStopped) return;
+    player.load(playbackSrc).then(() => {
+      if (!attempt.isCurrent) return;
       this._loadInProgress = false;
-      this.current = track;
       onLoaded?.(track);
 
       // Execute any pending seek that arrived during loading
@@ -231,7 +327,7 @@ export class Player {
         this.play();
       }
     }).catch(err => {
-      if (generation !== this._loadGeneration || this._isStopped) return;
+      if (!attempt.isCurrent) return;
       this._loadInProgress = false;
       this._pendingSeek = undefined;
       this.onError(this.toNormalizedError(err));
@@ -240,8 +336,14 @@ export class Player {
   stop(onComplete) {
     const player = this.requirePlayer();
 
+    // Whatever was loading no longer owns the player: its continuations, at
+    // either boundary, must not revive it.
+    this.cancelLoadAttempt();
+
     // Match Android: stop sets playWhenReady=false and state=stopped,
-    // but keeps the current track so play() can resume.
+    // but keeps the current track so play() can resume — from where it
+    // stopped, which ExoPlayer preserves across its own stop/prepare pair.
+    this.rememberResumePosition();
     this._isStopped = true;
     this._loadInProgress = false;
     this._pendingSeek = undefined;
@@ -254,34 +356,125 @@ export class Player {
       onComplete?.(); // Still call onComplete so callers aren't left hanging
     });
   }
+
+  /**
+   * Where playback was when it failed or was stopped, so a re-prepare can
+   * resume rather than restart.
+   *
+   * Kept against the track it belongs to rather than as a bare number, so it
+   * self-invalidates when a different track becomes current and cannot be
+   * applied to the wrong one.
+   */
+
+  /**
+   * Records the current position, when there is one worth recording.
+   *
+   * A zero is never recorded: `onError` runs for a *load* failure too, where
+   * the element has just been torn down and reads 0, and overwriting a good
+   * position with that made a failed retry lose the place a successful one
+   * would have resumed from.
+   */
+  rememberResumePosition() {
+    const position = this.element?.currentTime;
+    const track = this.current;
+    if (!track || typeof position !== 'number' || position <= 0) return;
+    this._resume = {
+      track,
+      position
+    };
+  }
+
+  /**
+   * Android's `prepare()`, which both `play()` and `retry()` call.
+   *
+   * It early-returns unless ExoPlayer is STATE_IDLE, so it reconnects after an
+   * error or a stop and never re-buffers a healthy stream; `error`/`_isStopped`
+   * is web's equivalent of idle. Re-preparing re-resolves the URL, which is the
+   * whole point — a signed URL or token may have expired since the failure, and
+   * replaying the cached one just fails again. iOS says the same thing in its
+   * own `retry()`: "Re-resolve rather than replay the cached URL".
+   *
+   * Returns whether it handled the call, so `play()` knows not to also poke the
+   * element.
+   */
+  reprepare() {
+    if (!this.current) return false;
+    if (this.state.state !== State.Error && !this._isStopped) return false;
+
+    // Not for live: `currentTime` there is elapsed time on a connection that no
+    // longer exists, and a fresh connection already *is* the live edge. Seeking
+    // to the old value asks for a point the new stream does not have. The
+    // track's own `live` declaration is the gate, as it is in `seekToLiveEdge`
+    // and on both native platforms.
+    const remembered = this._resume?.track === this.current ? this._resume.position : undefined;
+    const resume = this.current.live === true ? undefined : remembered;
+    this.reloadCurrent(resume);
+    return true;
+  }
   play() {
     const element = this.requireElement();
     this.playWhenReady = true;
-    if (this.state.state === State.Error && this.current) {
-      this.reloadCurrent();
-      return;
-    }
 
-    // Match Android: play() after stop() re-prepares the current track
-    if (this._isStopped && this.current) {
-      this.reloadCurrent();
-      return;
-    }
-    element.play().catch(err => console.error(err));
+    // Matches Android's play(): set the intent, then prepare — which does
+    // something only when idle, i.e. after an error or a stop.
+    if (this.reprepare()) return;
+    element.play().catch(err => this.onPlayRejected(err));
+  }
+
+  /**
+   * A rejected `element.play()`. Web-only: neither native platform can refuse
+   * a play intent, so there is no parity target here.
+   *
+   * `AbortError` means a newer load interrupted this one — that load owns the
+   * state and the intent stands. Anything else, autoplay policy above all, is
+   * the browser refusing: the intent cannot be honoured, so it is cleared and
+   * the state settles rather than stranding on `loading`/`buffering`, which is
+   * where suppressing `ready` under `playWhenReady` would otherwise leave it.
+   */
+  onPlayRejected(err) {
+    console.error(err);
+    const name = typeof err === 'object' && err !== null && 'name' in err ? err.name : undefined;
+    if (name === 'AbortError') return;
+    this.playWhenReady = false;
+    this.dispatch({
+      type: 'paused',
+      hasAsset: this.current !== undefined
+    });
   }
 
   /**
-   * Reloads the current track. `current` holds the *resolved* track, so
-   * subclasses that resolve media URLs override this to reload from the
-   * original source instead — re-feeding `current` into `load()` would
-   * re-resolve an already-resolved URL and leak it into the queue.
+   * The track a reload re-feeds. `current` holds it as the caller queued it —
+   * `load()` takes the resolved URL separately, via `LoadOptions.src` — so
+   * re-feeding it is safe.
+   *
+   * The overridable part of {@link reloadCurrent}, rather than the whole
+   * method: a subclass backed by a queue changes only where the track comes
+   * from, and the reload itself stays in one place.
    */
-  reloadCurrent() {
-    if (this.current) this.load(this.current);
+  trackToReload() {
+    return this.current;
+  }
+
+  /** Reloads the track {@link trackToReload} names, resuming if asked to. */
+  reloadCurrent(resumePosition) {
+    const track = this.trackToReload();
+    if (!track) return;
+    this.load(track, resumePosition === undefined ? undefined : () => this.seekTo(resumePosition));
   }
+
+  /**
+   * Android's `retry()` is `player.prepare()` — the same call `play()` makes,
+   * without setting the intent. So this is `play()` minus the intent.
+   *
+   * It is emphatically not `shaka.Player.retryStreaming()`, which this used to
+   * call: that returns false and does nothing at all unless the load mode is
+   * MEDIA_SOURCE, so for a progressive file — the case a signed URL is for — it
+   * was a silent no-op, while the `play()` the same docs offer as the
+   * alternative recovered properly.
+   */
   retry() {
-    const player = this.requirePlayer();
-    player.retryStreaming();
+    this.requirePlayer();
+    this.reprepare();
   }
   pause() {
     const element = this.requireElement();

package/lib/module/web/TrackPlayer/Player.js.map

@@ -1 +1 @@
-{"version":3,"names":["playbackErrorKind","nextPlaybackState","SetupNotCalledError","State","Player","hasInitialized","_current","undefined","_playWhenReady","_state","state","None","_isStopped","_loadInProgress","current","cur","newState","playWhenReady","pwr","requireElement","element","requirePlayer","player","setupPlayer","_options","window","shaka","default","polyfill","installAll","isBrowserSupported","Error","error","kind","code","message","document","createElement","setAttribute","body","appendChild","attach","addEventListener","event","errorEvent","onError","detail","dispatch","type","hasAsset","bufferingEvent","buffering","__DEV__","rnab","next","applyState","toNormalizedError","err","e","data","String","shakaError","unload","catch","console","status","httpStatus","navigator","onLine","toString","statusCode","debug","_loadGeneration","load","track","onLoaded","generation","src","_pendingSeek","then","currentTime","play","stop","onComplete","Stopped","reloadCurrent","retry","retryStreaming","pause","togglePlayback","setRate","rate","defaultPlaybackRate","playbackRate","getRate","seekBy","offset","seekTo","seconds","seekToLiveEdge","live","seekable","end","length","setVolume","volume","getVolume","getProgress","buffered","position","duration"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/Player.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["playbackErrorKind","LoadAttempt","nextPlaybackState","SetupNotCalledError","State","LOAD_INTERRUPTED","Player","hasInitialized","_current","undefined","_playWhenReady","_state","state","None","_isStopped","_loadInProgress","current","cur","newState","playWhenReady","pwr","requireElement","element","requirePlayer","player","setupPlayer","_options","window","shaka","default","polyfill","installAll","isBrowserSupported","Error","error","kind","code","message","document","createElement","setAttribute","body","appendChild","attach","getNetworkingEngine","registerRequestFilter","_type","request","headers","mediaHeaders","addEventListener","event","errorEvent","onError","detail","dispatch","type","ended","hasAsset","bufferingEvent","buffering","__DEV__","rnab","next","applyState","toNormalizedError","err","e","data","String","shakaError","console","debug","rememberResumePosition","unload","catch","status","httpStatus","navigator","onLine","toString","statusCode","beginLoadAttempt","_attempt","cancel","attempt","cancelLoadAttempt","load","track","onLoaded","options","Object","keys","length","playbackSrc","src","_pendingSeek","then","isCurrent","currentTime","play","stop","onComplete","Stopped","position","_resume","reprepare","remembered","resume","live","reloadCurrent","onPlayRejected","name","trackToReload","resumePosition","seekTo","retry","pause","togglePlayback","setRate","rate","defaultPlaybackRate","playbackRate","getRate","seekBy","offset","seconds","seekToLiveEdge","seekable","end","setVolume","volume","getVolume","getProgress","buffered","duration"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/Player.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/TrackPlayer/QueuePlayer.js

@@ -18,35 +18,56 @@ export class QueuePlayer extends Player {
     // was a silent pause) and armed load()'s auto-play with phantom intent.
     // Cleared before the state lands so consumers observe the native order
     // (intent → state → queueEnded), independent of onQueueEnded overrides.
-    // Per-track ends that advance the queue keep the intent.
-    if (state === State.Ended && this.endsQueue()) {
-      this.playWhenReady = false;
+    if (state !== State.Ended) {
+      super.applyState(state);
+      return;
     }
-    super.applyState(state);
 
-    // dispatch() already gates on _isStopped before reaching applyState, so a
-    // natural end while stopped never advances the queue.
-    if (state === State.Ended) {
+    // A track ending mid-queue is not an `ended` playback state: ExoPlayer
+    // reaches STATE_ENDED only at the end of the *playlist*, and an advance
+    // between items stays READY/BUFFERING. Web loads one track at a time, so
+    // the element's own `ended` arrives every time — reporting it flashed a
+    // terminal state, and dropped `PlayingState.playing` to false, between
+    // every pair of tracks. Repeat-one counts as mid-queue for the same
+    // reason: native reports nothing there either.
+    if (this.endsQueue()) {
+      // The real end: the intent goes with it, and the state is genuinely ended.
+      this.playWhenReady = false;
+      super.applyState(state);
+      // dispatch() already gates on _isStopped before reaching applyState, so a
+      // natural end while stopped never advances the queue.
       this.onTrackEnded();
+      return;
     }
+
+    // Suppressing `ended` is only safe when something takes over the state. A
+    // handler that declines to advance — the sleep timer set to end-of-track —
+    // leaves nothing to move it, and the player would sit reporting `playing`
+    // with nothing playing. Report the end in that case, as before.
+    if (!this.onTrackEnded()) super.applyState(state);
   }
 
   /** True when a natural end has nowhere to go: not repeating, no next track. */
   endsQueue() {
     return this.queue.repeatMode !== RepeatMode.Track && this.queue.repeatMode !== RepeatMode.Queue && this.queue.nextIndex() === undefined;
   }
+
+  /**
+   * @returns whether it started another load, and so owns the playback state
+   *   from here. `false` means the caller still has to report the end itself.
+   */
   onTrackEnded() {
     if (this.queue.repeatMode === RepeatMode.Track) {
-      if (this.queue.currentIndex !== undefined) {
-        this.goToIndex(this.queue.currentIndex);
-      }
-      return;
+      if (this.queue.currentIndex === undefined) return false;
+      this.goToIndex(this.queue.currentIndex);
+      return true;
     }
     if (this.endsQueue()) {
       this.onQueueEnded();
-      return;
+      return false;
     }
     this.skipToNext();
+    return true;
   }
 
   /**

package/lib/module/web/TrackPlayer/QueuePlayer.js.map

@@ -1 +1 @@
-{"version":3,"names":["Player","QueueManager","RepeatMode","State","QueuePlayer","queue","applyState","state","Ended","endsQueue","playWhenReady","onTrackEnded","repeatMode","Track","Queue","nextIndex","undefined","currentIndex","goToIndex","onQueueEnded","skipToNext","index","initialPosition","track","getTrack","onLoaded","_track","seekTo","load","_isStopped","play","add","tracks","insertBeforeIndex","insert","skip","Error","wrapAroundFirstIndex","skipToPrevious","previousIndex","wrapAroundLastIndex","setShuffleEnabled","enabled","getShuffleEnabled","shuffleEnabled","setRepeatMode","mode","getRepeatMode","remove","indexes","outcome","kind","current","stop","onComplete","reset","clear","removeUpcomingTracks","removeUpcoming","move","fromIndex","toIndex"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/QueuePlayer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Player","QueueManager","RepeatMode","State","QueuePlayer","queue","applyState","state","Ended","endsQueue","playWhenReady","onTrackEnded","repeatMode","Track","Queue","nextIndex","undefined","currentIndex","goToIndex","onQueueEnded","skipToNext","index","initialPosition","track","getTrack","onLoaded","_track","seekTo","load","_isStopped","play","add","tracks","insertBeforeIndex","insert","skip","Error","wrapAroundFirstIndex","skipToPrevious","previousIndex","wrapAroundLastIndex","setShuffleEnabled","enabled","getShuffleEnabled","shuffleEnabled","setRepeatMode","mode","getRepeatMode","remove","indexes","outcome","kind","current","stop","onComplete","reset","clear","removeUpcomingTracks","removeUpcoming","move","fromIndex","toIndex"],"sourceRoot":"../../../../src","sources":["web/TrackPlayer/QueuePlayer.ts"],"mappings":";;AAKA,SAASA,MAAM,QAAQ,UAAU;AACjC,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,SAASC,UAAU,QAAQ,cAAc;AACzC,SAASC,KAAK,QAAQ,SAAS;;AAE/B;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,SAASJ,MAAM,CAAC;EAC5BK,KAAK,GAAG,IAAIJ,YAAY,CAAC,CAAC;EAE1BK,UAAUA,CAACC,KAAoB,EAAE;IACzC;IACA;IACA;IACA;IACA;IACA,IAAIA,KAAK,KAAKJ,KAAK,CAACK,KAAK,EAAE;MACzB,KAAK,CAACF,UAAU,CAACC,KAAK,CAAC;MACvB;IACF;;IAEA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,IAAI,IAAI,CAACE,SAAS,CAAC,CAAC,EAAE;MACpB;MACA,IAAI,CAACC,aAAa,GAAG,KAAK;MAC1B,KAAK,CAACJ,UAAU,CAACC,KAAK,CAAC;MACvB;MACA;MACA,IAAI,CAACI,YAAY,CAAC,CAAC;MACnB;IACF;;IAEA;IACA;IACA;IACA;IACA,IAAI,CAAC,IAAI,CAACA,YAAY,CAAC,CAAC,EAAE,KAAK,CAACL,UAAU,CAACC,KAAK,CAAC;EACnD;;EAEA;EACQE,SAASA,CAAA,EAAY;IAC3B,OACE,IAAI,CAACJ,KAAK,CAACO,UAAU,KAAKV,UAAU,CAACW,KAAK,IAC1C,IAAI,CAACR,KAAK,CAACO,UAAU,KAAKV,UAAU,CAACY,KAAK,IAC1C,IAAI,CAACT,KAAK,CAACU,SAAS,CAAC,CAAC,KAAKC,SAAS;EAExC;;EAEA;AACF;AACA;AACA;EACYL,YAAYA,CAAA,EAAY;IAChC,IAAI,IAAI,CAACN,KAAK,CAACO,UAAU,KAAKV,UAAU,CAACW,KAAK,EAAE;MAC9C,IAAI,IAAI,CAACR,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE,OAAO,KAAK;MACvD,IAAI,CAACE,SAAS,CAAC,IAAI,CAACb,KAAK,CAACY,YAAY,CAAC;MACvC,OAAO,IAAI;IACb;IACA,IAAI,IAAI,CAACR,SAAS,CAAC,CAAC,EAAE;MACpB,IAAI,CAACU,YAAY,CAAC,CAAC;MACnB,OAAO,KAAK;IACd;IACA,IAAI,CAACC,UAAU,CAAC,CAAC;IACjB,OAAO,IAAI;EACb;;EAEA;AACF;AACA;AACA;AACA;EACYD,YAAYA,CAAA,EAAG,CAAC;EAEhBD,SAASA,CAACG,KAAa,EAAEC,eAAwB,EAAE;IAC3D,MAAMC,KAAK,GAAG,IAAI,CAAClB,KAAK,CAACmB,QAAQ,CAACH,KAAK,CAAC;IAExC,IAAI,CAACE,KAAK,EAAE;;IAEZ;IACA,MAAME,QAAQ,GAAIC,MAAa,IAAK;MAClC,IAAIJ,eAAe,KAAKN,SAAS,EAAE;QACjC,IAAI,CAACW,MAAM,CAACL,eAAe,CAAC;MAC9B;IACF,CAAC;IAED,IAAI,IAAI,CAACjB,KAAK,CAACY,YAAY,KAAKI,KAAK,EAAE;MACrC,IAAI,CAAChB,KAAK,CAACY,YAAY,GAAGI,KAAK;MAC/B,IAAI,CAACO,IAAI,CAACL,KAAK,EAAEE,QAAQ,CAAC;IAC5B,CAAC,MAAM,IAAI,IAAI,CAACI,UAAU,EAAE;MAC1B;MACA,IAAI,CAACD,IAAI,CAACL,KAAK,EAAEE,QAAQ,CAAC;IAC5B,CAAC,MAAM;MACL;MACA,IAAI,CAACE,MAAM,CAACL,eAAe,IAAI,CAAC,CAAC;MACjC,IAAI,IAAI,CAACZ,aAAa,EAAE;QACtB,IAAI,CAACoB,IAAI,CAAC,CAAC;MACb;IACF;EACF;EAEOC,GAAGA,CAACC,MAAe,EAAEC,iBAA0B,EAAQ;IAC5D,IAAI,CAAC5B,KAAK,CAAC6B,MAAM,CAACF,MAAM,EAAEC,iBAAiB,CAAC;IAE5C,IAAI,IAAI,CAAC5B,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;MACzC,IAAI,CAACE,SAAS,CAAC,CAAC,CAAC;IACnB;EACF;EAEOiB,IAAIA,CAACd,KAAa,EAAEC,eAAwB,EAAQ;IACzD,IAAI,IAAI,CAACjB,KAAK,CAACmB,QAAQ,CAACH,KAAK,CAAC,KAAKL,SAAS,EAAE;MAC5C,MAAM,IAAIoB,KAAK,CAAC,qBAAqB,CAAC;IACxC;IAEA,IAAI,CAAClB,SAAS,CAACG,KAAK,EAAEC,eAAe,CAAC;EACxC;EAEOF,UAAUA,CAACE,eAAwB,EAAQ;IAChD,IAAI,IAAI,CAACjB,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;IAE3C,MAAMD,SAAS,GACb,IAAI,CAACV,KAAK,CAACU,SAAS,CAAC,CAAC,IAAI,IAAI,CAACV,KAAK,CAACgC,oBAAoB,CAAC,CAAC;IAC7D,IAAItB,SAAS,KAAKC,SAAS,EAAE;IAE7B,IAAI,CAACE,SAAS,CAACH,SAAS,EAAEO,eAAe,CAAC;EAC5C;EAEOgB,cAAcA,CAAChB,eAAwB,EAAQ;IACpD,IAAI,IAAI,CAACjB,KAAK,CAACY,YAAY,KAAKD,SAAS,EAAE;IAE3C,MAAMuB,aAAa,GACjB,IAAI,CAAClC,KAAK,CAACkC,aAAa,CAAC,CAAC,IAAI,IAAI,CAAClC,KAAK,CAACmC,mBAAmB,CAAC,CAAC;IAChE,IAAID,aAAa,KAAKvB,SAAS,EAAE;IAEjC,IAAI,CAACE,SAAS,CAACqB,aAAa,EAAEjB,eAAe,CAAC;EAChD;EAEOmB,iBAAiBA,CAACC,OAAgB,EAAQ;IAC/C,IAAI,CAACrC,KAAK,CAACoC,iBAAiB,CAACC,OAAO,CAAC;EACvC;EAEOC,iBAAiBA,CAAA,EAAY;IAClC,OAAO,IAAI,CAACtC,KAAK,CAACuC,cAAc;EAClC;EAEOpB,QAAQA,CAACH,KAAa,EAAqB;IAChD,OAAO,IAAI,CAAChB,KAAK,CAACmB,QAAQ,CAACH,KAAK,CAAC;EACnC;EAEOwB,aAAaA,CAACC,IAAoB,EAAQ;IAC/C,IAAI,CAACzC,KAAK,CAACO,UAAU,GAAGkC,IAAI;EAC9B;EAEOC,aAAaA,CAAA,EAAmB;IACrC,OAAO,IAAI,CAAC1C,KAAK,CAACO,UAAU;EAC9B;EAEOoC,MAAMA,CAACC,OAAiB,EAAQ;IACrC,MAAMC,OAAO,GAAG,IAAI,CAAC7C,KAAK,CAAC2C,MAAM,CAACC,OAAO,CAAC;IAC1C,QAAQC,OAAO,CAACC,IAAI;MAClB,KAAK,YAAY;MACjB,KAAK,MAAM;QACT;MACF,KAAK,QAAQ;QACX,IAAI,CAACjC,SAAS,CAACgC,OAAO,CAAC7B,KAAK,CAAC;QAC7B;MACF,KAAK,SAAS;QACZ,IAAI,CAAC+B,OAAO,GAAGpC,SAAS;QACxB,IAAI,CAACqC,IAAI,CAAC,CAAC;QACX;IACJ;EACF;EAEOA,IAAIA,CAACC,UAAuB,EAAQ;IACzC,KAAK,CAACD,IAAI,CAACC,UAAU,CAAC;EACxB;EAEOC,KAAKA,CAAA,EAAS;IACnB;IACA;IACA;IACA,IAAI,CAAClD,KAAK,CAACmD,KAAK,CAAC,CAAC;IAClB,IAAI,CAACJ,OAAO,GAAGpC,SAAS;IACxB,IAAI,CAACqC,IAAI,CAAC,CAAC;EACb;EAEOI,oBAAoBA,CAAA,EAAS;IAClC,IAAI,CAACpD,KAAK,CAACqD,cAAc,CAAC,CAAC;EAC7B;EAEOC,IAAIA,CAACC,SAAiB,EAAEC,OAAe,EAAQ;IACpD,IAAI,CAACxD,KAAK,CAACsD,IAAI,CAACC,SAAS,EAAEC,OAAO,CAAC;EACrC;AACF","ignoreList":[]}

package/lib/module/web/browser/BrowserManager.js

@@ -294,6 +294,9 @@ export class BrowserManager {
    * results (no contextual URLs), like the native `makeSearchResult`.
    * Matches Android's BrowserManager.search() which bypasses resolve() entirely.
    *
+   * A failed search propagates, so `navigate` turns it into a navigation error
+   * the way it does a failed browse resolve.
+   *
    * @param searchPath The search path (format: /__search?q=query)
    * @returns ResolvedTrack containing search results as one untitled section
    */
@@ -323,14 +326,9 @@ export class BrowserManager {
     }
     // Handle request config-based search via the shared layered fetch.
     else if (searchRoute.searchConfig) {
-      try {
-        searchResults = await this.fetchSearchResults(searchRoute.searchConfig, {
-          q: query
-        });
-      } catch (error) {
-        console.error('Search failed:', error);
-        return undefined;
-      }
+      searchResults = await this.fetchSearchResults(searchRoute.searchConfig, {
+        q: query
+      });
     }
 
     // Search callbacks should return fresh tracks without contextual paths (like Android)
@@ -347,10 +345,13 @@ export class BrowserManager {
    * Matches Android's artwork URL transformation with full Track access.
    */
   async transformArtworkForContent(content) {
+    // No short-circuit on a missing artwork config: Android gates per *track*
+    // (`artworkConfig == null && track.artwork == null`), so a track carrying a
+    // plain `artwork` URL still gets an `artworkSource`. Returning early here
+    // meant an app with no `artwork` block never populated the field at all —
+    // `resolveArtworkSourceAsync` already handles the no-config case the way
+    // `resolveArtworkUrl` does on Android.
     const artworkConfig = this._configuration.artwork;
-    if (!artworkConfig) {
-      return content;
-    }
     // The shared request layer applies to artwork too — use the resolved layer
     // (resolver result or static config) so a resolver-only config still works.
     await this.ensureLayersResolved();
@@ -430,6 +431,22 @@ export class BrowserManager {
     return undefined;
   }
 
+  /**
+   * Ensures the request layer is resolved for the current generation and
+   * returns it — the resolver's result when a `requestResolver` is configured,
+   * else the static `request`.
+   *
+   * Consumers outside the browse path (media URL building, artwork) must reach
+   * the request layer through this rather than reading `configuration.request`,
+   * or a resolver-only config silently loses its baseUrl, headers and transform
+   * exactly where a credential is needed. Mirrors Android's
+   * `BrowserManager.resolvedRequestConfig()`, which carries the same warning.
+   */
+  async resolvedRequestConfig() {
+    await this.ensureLayersResolved();
+    return this._resolvedRequest;
+  }
+
   /**
    * Ensures the request/browse layer configs are resolved for the current
    * generation. Any present resolver is invoked once per generation and the
@@ -578,8 +595,9 @@ export class BrowserManager {
 
     // Transform artwork URLs on tabs via the async resolver so the shared
     // request layer (incl. its transform) applies, matching content/search.
+    // Gated per track inside the resolver, as on Android — see
+    // `transformArtworkForContent`.
     const artworkConfig = this._configuration.artwork;
-    if (!artworkConfig) return tabs;
     // Resolved request layer (resolver or static), matching content/search.
     await this.ensureLayersResolved();
     const requestConfig = this._resolvedRequest;