react-native-audio-browser 0.2.0-next.3 → 0.2.0-next.31

package/lib/module/web/http/RequestConfigBuilder.js

@@ -41,6 +41,11 @@ function applyImageQueryParams(config, imgParams, context) {
   };
 }
 
+/** Whether `after` carries a header `before` had not already set identically. */
+function addsHeaders(before, after) {
+  if (!after) return false;
+  return Object.entries(after).some(([key, value]) => before?.[key] !== value);
+}
 /**
  * Builds and merges request configurations.
  * Mirrors Android's RequestConfigBuilder.kt
@@ -81,7 +86,9 @@ export const RequestConfigBuilder = {
    * A layer with a transform wins completely — it receives the base (plus route
    * params) and its result replaces the base; the layer's own static fields are
    * ignored. A layer without a transform merges its static fields over the base.
-   * `path` is carried from the base — only a transform may change it.
+   * `path` is carried from the base — only a transform may change it. A
+   * throwing transform falls back to the base, so the layer is skipped and the
+   * ladder continues.
    *
    * Mirrors native's BrowserManager.applyLayer so web resolves the shared
    * `request` → `<kind>` → route chain identically across platforms.
@@ -92,10 +99,21 @@ export const RequestConfigBuilder = {
     // its result replaces it. When both are set they run as a pipeline — async
     // first, then sync (mirrors native applyLayer).
     if (layer.transform || layer.transformSync) {
-      let cfg = base;
-      if (layer.transform) cfg = await layer.transform(cfg, params);
-      if (layer.transformSync) cfg = layer.transformSync(cfg, params);
-      return cfg;
+      try {
+        let cfg = base;
+        if (layer.transform) cfg = await layer.transform(cfg, params);
+        if (layer.transformSync) cfg = layer.transformSync(cfg, params);
+        return cfg;
+      } catch (e) {
+        // A throwing transform costs its own layer, not the ladder: the layers
+        // under it stand, so a relative path still gets the shared `baseUrl`
+        // and a media request keeps the shared credential. One catch around
+        // the pair, as native has it, so a sync stage that throws after a
+        // successful async one also falls back to the layer's input rather
+        // than to a half-applied config.
+        console.error('Failed to apply transform function, using base config', e);
+        return base;
+      }
     }
     return {
       method: layer.method ?? base.method,
@@ -138,31 +156,103 @@ export const RequestConfigBuilder = {
     };
   },
   /**
-   * Resolves a media URL using the media configuration.
-   * Creates a RequestConfig with the track's src as the path, then builds the URL.
-   * Supports the transform callback for URL manipulation.
+   * Resolves a media request from the layered configuration, returning the
+   * whole request rather than just its URL.
+   *
+   * The layers resolve headers (and a user agent) alongside the URL, and the
+   * media request needs all of them: native applies them to the AVURLAsset /
+   * ExoPlayer DataSpec, so web has to apply them to Shaka's requests or the
+   * same configuration authenticates on iOS and Android but 401s here.
    *
-   * The shared `request` layer is applied first (its transform runs for media
-   * too, per the documented contract — e.g. a dynamic baseUrl), then the media
-   * transform / static fields on top. Mirrors native's resolveMediaUrl,
-   * including its best-effort behaviour: if a transform throws, fall back to the
-   * original `src` rather than failing the load.
+   * The resolved URL is returned in `path`, with `baseUrl` already folded into
+   * it. Best-effort throughout, but at two levels: a throwing transform or
+   * resolver costs only its own layer (see {@link applyLayer}), and the catch
+   * here is the backstop for anything left — a malformed `baseUrl` reaching
+   * `buildUrl`, say — which falls back to the bare `src`.
+   *
+   * The chain is `request` → `media` → `media.resolve(track)`, matching
+   * native's. See {@link applyMediaResolve} for why the per-track resolver goes
+   * last.
    *
    * @param src The track's src value (may be relative or absolute)
    * @param requestConfig The shared request configuration (applied first)
    * @param mediaConfig The media request configuration
-   * @returns The resolved absolute URL
+   * @param track The track being loaded, for `media.resolve`; without it the
+   *   per-track layer is skipped and the static layers stand
+   * @returns The resolved request, its URL in `path`
    */
-  async resolveMediaUrl(src, requestConfig, mediaConfig) {
+  async resolveMediaRequest(src, requestConfig, mediaConfig, track) {
     try {
-      const config = await this.applyLayers({
+      // The layers are applied one at a time rather than through `applyLayers`
+      // so the media layer's own header contribution stays visible; each
+      // transform still runs exactly once.
+      const shared = await this.applyLayer({
         path: src
-      }, [requestConfig, mediaConfig]);
-      return BrowserPathHelper.buildUrl(config.baseUrl, config.path ?? src);
+      }, requestConfig);
+      const layered = await this.applyLayer(shared, mediaConfig);
+      const config = await this.applyMediaResolve(layered, mediaConfig, track);
+      // buildUrl folds in baseUrl *and* appends `query`; both are cleared on
+      // the way out so the resolved url can't be rebuilt and double-applied.
+      return {
+        ...config,
+        baseUrl: undefined,
+        query: undefined,
+        path: this.buildUrl({
+          ...config,
+          path: config.path ?? src
+        }),
+        mediaLayerHeaders: addsHeaders(shared.headers, config.headers)
+      };
     } catch (e) {
       console.error('Failed to resolve media URL, using original src', e);
-      return BrowserPathHelper.buildUrl(undefined, src);
+      return {
+        path: BrowserPathHelper.buildUrl(undefined, src),
+        mediaLayerHeaders: false
+      };
+    }
+  },
+  /**
+   * Applies `media.resolve(track)` / `media.resolveSync(track)` as the final,
+   * most-specific layer over an already request+media-layered config. A no-op
+   * without a track or a resolver, so the layers stand on their own.
+   *
+   * Last, not first: native runs the media layer's transform and then lets the
+   * per-track resolver win over the result (Android `applyMediaResolve`, iOS
+   * `applyMediaResolveLayer`), so a resolver minting a signed URL is not
+   * overwritten by the static layer that shaped the unsigned one. Override-wins
+   * on every field, `path` included — replacing the URL outright is the point.
+   *
+   * A throwing resolver falls back to the layered config, as native does: the
+   * per-track shaping is lost, the layers under it are not.
+   */
+  async applyMediaResolve(layered, mediaConfig, track) {
+    if (!track || !mediaConfig) return layered;
+    if (!mediaConfig.resolve && !mediaConfig.resolveSync) return layered;
+    try {
+      const resolved = await this.composeResolved(mediaConfig, track);
+      return resolved ? this.mergeConfig(layered, resolved) : layered;
+    } catch (e) {
+      console.error('Failed to apply media.resolve, using layered config', e);
+      return layered;
+    }
+  },
+  /**
+   * Runs a config's per-track resolvers and composes their output: async
+   * `resolve` first, then `resolveSync` merged over it, sync winning.
+   * `undefined` when neither is set or neither produced a config.
+   *
+   * Media and artwork share the pairing, so it lives here rather than in both
+   * — the same reason native has `composeResolved`. Errors are the callers' to
+   * handle: the two paths differ on what a throwing resolver costs.
+   */
+  async composeResolved(config, track) {
+    let resolved;
+    if (config.resolve) resolved = await config.resolve(track);
+    if (config.resolveSync) {
+      const sync = config.resolveSync(track);
+      resolved = resolved ? this.mergeConfig(resolved, sync) : sync;
     }
+    return resolved;
   },
   /**
    * Resolves an artwork URL and creates an ImageSource.
@@ -246,14 +336,7 @@ export const RequestConfigBuilder = {
 
       // Step 1: Per-track resolution — async `resolve` first, then `resolveSync`
       // merged over it (mirrors native).
-      let resolvedConfig;
-      if (artworkConfig.resolve) {
-        resolvedConfig = await artworkConfig.resolve(track);
-      }
-      if (artworkConfig.resolveSync) {
-        const r = artworkConfig.resolveSync(track);
-        resolvedConfig = resolvedConfig ? this.mergeConfig(resolvedConfig, r) : r;
-      }
+      const resolvedConfig = await this.composeResolved(artworkConfig, track);
       // If a resolver ran but produced nothing and there's no artwork URL, no artwork
       if ((artworkConfig.resolve || artworkConfig.resolveSync) && !resolvedConfig && artworkUrl === undefined) {
         return undefined;

package/lib/module/web/http/RequestConfigBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["artworkUrl","resolveArtworkUrl","BrowserPathHelper","appendQueryParams","url","query","Object","keys","length","params","URLSearchParams","key","value","entries","undefined","append","String","queryString","toString","separator","includes","applyImageQueryParams","config","imgParams","context","width","height","RequestConfigBuilder","buildUrl","path","baseUrl","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","applyLayer","layer","transform","transformSync","cfg","applyLayers","layers","merged","toRequestConfig","resolveMediaUrl","src","requestConfig","mediaConfig","e","console","error","resolveArtworkSource","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","track","imageContext","artwork","baseConfig","resolvedConfig","resolve","resolveSync","r","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["artworkUrl","resolveArtworkUrl","BrowserPathHelper","appendQueryParams","url","query","Object","keys","length","params","URLSearchParams","key","value","entries","undefined","append","String","queryString","toString","separator","includes","applyImageQueryParams","config","imgParams","context","width","height","addsHeaders","before","after","some","RequestConfigBuilder","buildUrl","path","baseUrl","mergeConfig","base","override","method","headers","mergeHeaders","mergeQuery","body","contentType","userAgent","applyLayer","layer","transform","transformSync","cfg","e","console","error","applyLayers","layers","merged","toRequestConfig","resolveMediaRequest","src","requestConfig","mediaConfig","track","shared","layered","applyMediaResolve","mediaLayerHeaders","resolve","resolveSync","resolved","composeResolved","sync","resolveArtworkSource","artworkConfig","resolvedUri","uri","resolveArtworkSourceAsync","imageContext","artwork","baseConfig","resolvedConfig","mergedConfig","imageQueryParams","request","finalUri","transformTrackArtwork","artworkSource"],"sourceRoot":"../../../../src","sources":["web/http/RequestConfigBuilder.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/http/followMediaRedirect.js

@@ -0,0 +1,215 @@
+"use strict";
+
+/**
+ * Resolves a media URL that is authenticated by a header.
+ *
+ * Shaka only routes manifest requests through its networking engine, where a
+ * request filter can attach headers. A progressive file is played by assigning
+ * `mediaElement.src`, and a media element cannot send custom headers — so such
+ * a URL is unplayable that way. Following the redirect here yields the signed,
+ * public URL these endpoints hand back, which needs no auth of its own.
+ *
+ * Best effort and bounded: anything that fails — including taking too long, see
+ * {@link PROBE_TIMEOUT_MS} — falls back to the original URL, so the load fails
+ * or succeeds on its own terms rather than ours. It must never be the reason a
+ * load hangs: `load()` awaits this before Shaka sees the URL at all.
+ *
+ * Gated, because the probe is not free: a HEAD at a third-party stream host
+ * costs a CORS preflight, and most will refuse it, so an app that never
+ * authenticates its media would pay a round trip on every play for a result it
+ * always discards. It runs only for headers that look like media credentials
+ * ({@link isMediaAuth}), on media a media element actually has to play
+ * ({@link isManifestUrl}), and never on a URL the browser resolves locally.
+ */
+
+/** URLs the browser resolves locally; there is no redirect to follow. */
+const isLocalUrl = url => /^(file|blob|data|mediasource):/i.test(url);
+
+/**
+ * Extensions Shaka types as a manifest, from its own `EXTENSIONS_TO_MIME_TYPES_`
+ * map: HLS, DASH and Smooth Streaming.
+ */
+const MANIFEST_EXTENSIONS = new Set(['m3u8', 'mpd', 'ism']);
+
+/**
+ * Whether Shaka will parse this as a manifest rather than hand it to the media
+ * element — in which case the probe has nothing to offer and something to cost.
+ *
+ * A manifest goes through Shaka's networking engine, where the request filter
+ * attaches the headers to the manifest, its segments and any key requests. The
+ * probe cannot improve on that, and it actively breaks it: on a cross-origin
+ * redirect the probe clears the headers, so the segments that Android still
+ * authenticates would go out bare and 401. So this is a correctness fix as much
+ * as it is one fewer round trip.
+ *
+ * Extension-based, and therefore partial — Shaka guesses the same way
+ * (`NetworkingUtils.getExtension`), but plenty of HLS endpoints have no
+ * extension at all. Those still get probed, which is the status quo rather than
+ * a regression. Nothing on `Track` carries a MIME type to do better with.
+ */
+const isManifestUrl = url => {
+  const path = url.split(/[?#]/)[0] ?? '';
+  const filename = path.slice(path.lastIndexOf('/') + 1);
+  const pieces = filename.split('.');
+  return pieces.length > 1 && MANIFEST_EXTENSIONS.has(pieces[pieces.length - 1].toLowerCase());
+};
+/**
+ * How long the probe may take before the original URL is played instead.
+ *
+ * The same 8s the Android media client allows a connect or a read
+ * (`MediaFactory.mediaHttpClient`), which is generous for a HEAD but errs the
+ * safe way: a slow-but-working auth endpoint should not be abandoned, since
+ * giving up means playing a URL that will 401.
+ */
+const PROBE_TIMEOUT_MS = 8_000;
+
+/**
+ * `AbortSignal.timeout` where it exists (Safari 16+, Chrome 103+, Node 17.3+),
+ * else a hand-rolled equivalent, else nothing — an environment with neither
+ * still gets the deadline below, just without cancelling the request.
+ */
+const timeoutSignal = ms => {
+  if (typeof AbortSignal === 'undefined') return undefined;
+  if (typeof AbortSignal.timeout === 'function') return AbortSignal.timeout(ms);
+  if (typeof AbortController === 'undefined') return undefined;
+  const controller = new AbortController();
+  setTimeout(() => controller.abort(), ms);
+  return controller.signal;
+};
+
+/**
+ * The probe, with a deadline. `load()` awaits this before Shaka is asked to
+ * play anything, so an unreachable host would otherwise stall the load
+ * indefinitely — no audio, and no error to show for it.
+ *
+ * Two mechanisms, each with its own job: the signal cancels the request, so a
+ * dead host does not hold a connection open behind us, and the race bounds *us*
+ * even where the fetch implementation ignores the signal. Whichever fires, the
+ * caller treats it as any other probe failure and plays the original URL.
+ */
+const fetchWithDeadline = async (doFetch, url, headers, timeoutMs) => {
+  let timer;
+  try {
+    return await Promise.race([doFetch(url, {
+      method: 'HEAD',
+      headers,
+      redirect: 'follow',
+      signal: timeoutSignal(timeoutMs)
+    }), new Promise((_resolve, reject) => {
+      timer = setTimeout(() => reject(new Error(`Media redirect probe timed out (${timeoutMs}ms)`)), timeoutMs);
+    })]);
+  } finally {
+    if (timer !== undefined) clearTimeout(timer);
+  }
+};
+
+/**
+ * Whether these headers look like a media credential — the only thing the
+ * probe can fix, and the only thing worth a preflight.
+ *
+ * A header the `media` layer set is media-specific by construction. Otherwise
+ * only `Authorization` counts: an app authenticating one API for browse and
+ * media alike puts it on the shared `request` layer, and that is the common
+ * shape. Shared plumbing that also rides browse requests — an `X-Client-Version`
+ * — is not a credential and must not trigger the probe.
+ *
+ * The residual case is a shared layer carrying a custom auth header, say
+ * `X-Api-Key`, for media that needs it: move it to the `media` layer and the
+ * probe runs.
+ */
+const isMediaAuth = (headers, mediaLayerHeaders) => mediaLayerHeaders || Object.keys(headers).some(key => key.toLowerCase() === 'authorization');
+/**
+ * Origin of an http(s) URL, or undefined when it cannot be determined.
+ *
+ * Relative URLs are resolved against the document, because that is what the
+ * probe's own `fetch` does — a `src` of `/api/authed/7` is a request to the
+ * page's origin, so the credential went there. Without this a relative `src`
+ * has no origin, never matches the absolute URL the response reports, and the
+ * headers are dropped from every load that uses one.
+ *
+ * Parsed rather than pattern-matched so the comparison normalizes the way
+ * Android's `CrossOriginHeaderStripper.sameOrigin` does: `URL.host` omits a
+ * default port, so `https://a.com` and `https://a.com:443` are one origin, and
+ * it excludes userinfo, so `https://user@a.com` is not a third.
+ */
+const originOf = url => {
+  try {
+    const base = typeof location === 'undefined' ? undefined : location.href;
+    const {
+      protocol,
+      host
+    } = new URL(url, base);
+    if (protocol !== 'http:' && protocol !== 'https:') return undefined;
+    return `${protocol}//${host}`;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Whether the redirect left the origin the credential was addressed to.
+ *
+ * Only when both origins are known and differ. An origin we could not work out
+ * — a relative URL with no document base, outside a browser — is not evidence
+ * of a hop, and treating it as one is how the headers went missing before.
+ */
+const leftTheOrigin = (from, to) => {
+  const origin = originOf(from);
+  return origin !== undefined && originOf(to) !== origin;
+};
+export async function followMediaRedirect(url, headers, {
+  fetchImpl,
+  mediaLayerHeaders = false,
+  timeoutMs = PROBE_TIMEOUT_MS
+} = {}) {
+  if (!headers || Object.keys(headers).length === 0) return {
+    src: url,
+    headers
+  };
+  if (!isMediaAuth(headers, mediaLayerHeaders)) return {
+    src: url,
+    headers
+  };
+  if (isManifestUrl(url)) return {
+    src: url,
+    headers
+  };
+  if (isLocalUrl(url)) return {
+    src: url,
+    headers
+  };
+  const doFetch = fetchImpl ?? globalThis.fetch;
+  if (typeof doFetch !== 'function') return {
+    src: url,
+    headers
+  };
+  try {
+    // HEAD walks the chain without tripping download counting, which keys off
+    // ranged GETs. Deadlined, because the load waits on it.
+    const response = await fetchWithDeadline(doFetch, url, headers, timeoutMs);
+    const src = response.url || url;
+
+    // The status belongs to the *last* hop, so it only speaks for the
+    // authenticating endpoint when there was no redirect. Once one has
+    // happened, hop one authenticated and handed us its target, and a refusal
+    // past that is routinely about the method rather than the credential:
+    // presigned S3 and GCS URLs sign it — SigV4's canonical request opens with
+    // HTTPMethod, GCS V4's with HTTP_VERB — so a URL signed for GET answers a
+    // HEAD with 403. Keep the signed URL, which is the whole point of the walk,
+    // and let a real error surface through the player.
+    if (!response.ok && src === url) return {
+      src: url,
+      headers
+    };
+    return {
+      src,
+      headers: leftTheOrigin(url, src) ? undefined : headers
+    };
+  } catch {
+    return {
+      src: url,
+      headers
+    };
+  }
+}
+//# sourceMappingURL=followMediaRedirect.js.map

package/lib/module/web/http/followMediaRedirect.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["isLocalUrl","url","test","MANIFEST_EXTENSIONS","Set","isManifestUrl","path","split","filename","slice","lastIndexOf","pieces","length","has","toLowerCase","PROBE_TIMEOUT_MS","timeoutSignal","ms","AbortSignal","undefined","timeout","AbortController","controller","setTimeout","abort","signal","fetchWithDeadline","doFetch","headers","timeoutMs","timer","Promise","race","method","redirect","_resolve","reject","Error","clearTimeout","isMediaAuth","mediaLayerHeaders","Object","keys","some","key","originOf","base","location","href","protocol","host","URL","leftTheOrigin","from","to","origin","followMediaRedirect","fetchImpl","src","globalThis","fetch","response","ok"],"sourceRoot":"../../../../src","sources":["web/http/followMediaRedirect.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/player/NowPlayingManager.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { artworkUrl } from '../../utils/artwork';
+import { getTrackIdentity } from '../../utils/getTrackIdentity';
 
 /**
  * Manages now playing metadata overrides.
@@ -28,7 +29,7 @@ export class NowPlayingManager {
       album: update.album ?? currentTrack.album,
       artwork: artworkUrl(currentTrack.artwork),
       description: currentTrack.description,
-      mediaId: currentTrack.src ?? currentTrack.url,
+      mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
       genre: currentTrack.genre,
       duration
     } : {
@@ -37,7 +38,7 @@ export class NowPlayingManager {
       album: currentTrack.album,
       artwork: artworkUrl(currentTrack.artwork),
       description: currentTrack.description,
-      mediaId: currentTrack.src ?? currentTrack.url,
+      mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
       genre: currentTrack.genre,
       duration
     };
@@ -59,7 +60,7 @@ export class NowPlayingManager {
       album: this.override?.album ?? currentTrack.album,
       artwork: artworkUrl(currentTrack.artwork),
       description: currentTrack.description,
-      mediaId: currentTrack.src ?? currentTrack.url,
+      mediaId: getTrackIdentity(currentTrack) ?? currentTrack.path,
       genre: currentTrack.genre,
       duration
     };

package/lib/module/web/player/NowPlayingManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["artworkUrl","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":";;AAEA,SAASA,UAAU,QAAQ,qBAAqB;;AAEhD;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,CAAC;EAG7B;EACAC,mBAAmB,GAA2CA,CAAA,KAAM,CAAC,CAAC;;EAEtE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgBA,CACdC,MAAoC,EACpCC,YAA+B,EAC/BC,QAAgB,EACV;IACN,IAAI,CAACC,QAAQ,GAAGH,MAAM;IAEtB,IAAI,CAACC,YAAY,EAAE;IAEnB,MAAMG,QAA4B,GAAGJ,MAAM,GACvC;MACEK,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACzCC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAIL,YAAY,CAACK,MAAM;MAC5CC,KAAK,EAAEP,MAAM,CAACO,KAAK,IAAIN,YAAY,CAACM,KAAK;MACzCC,OAAO,EAAEZ,UAAU,CAACK,YAAY,CAACO,OAAO,CAAC;MACzCC,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,EAAEZ,UAAU,CAACK,YAAY,CAACO,OAAO,CAAC;MACzCC,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,EAAE,IAAI,CAACJ,QAAQ,EAAEI,KAAK,IAAIN,YAAY,CAACM,KAAK;MACjDC,OAAO,EAAEZ,UAAU,CAACK,YAAY,CAACO,OAAO,CAAC;MACzCC,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":[]}
+{"version":3,"names":["artworkUrl","getTrackIdentity","NowPlayingManager","onNowPlayingChanged","updateNowPlaying","update","currentTrack","duration","override","metadata","title","artist","album","artwork","description","mediaId","path","genre","getNowPlaying","undefined","clearNowPlayingOverride"],"sourceRoot":"../../../../src","sources":["web/player/NowPlayingManager.ts"],"mappings":";;AAEA,SAASA,UAAU,QAAQ,qBAAqB;AAChD,SAASC,gBAAgB,QAAQ,8BAA8B;;AAE/D;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,CAAC;EAG7B;EACAC,mBAAmB,GAA2CA,CAAA,KAAM,CAAC,CAAC;;EAEtE;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,gBAAgBA,CACdC,MAAoC,EACpCC,YAA+B,EAC/BC,QAAgB,EACV;IACN,IAAI,CAACC,QAAQ,GAAGH,MAAM;IAEtB,IAAI,CAACC,YAAY,EAAE;IAEnB,MAAMG,QAA4B,GAAGJ,MAAM,GACvC;MACEK,KAAK,EAAEL,MAAM,CAACK,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACzCC,MAAM,EAAEN,MAAM,CAACM,MAAM,IAAIL,YAAY,CAACK,MAAM;MAC5CC,KAAK,EAAEP,MAAM,CAACO,KAAK,IAAIN,YAAY,CAACM,KAAK;MACzCC,OAAO,EAAEb,UAAU,CAACM,YAAY,CAACO,OAAO,CAAC;MACzCC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAEd,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACU,IAAI;MAC5DC,KAAK,EAAEX,YAAY,CAACW,KAAK;MACzBV;IACF,CAAC,GACD;MACEG,KAAK,EAAEJ,YAAY,CAACI,KAAK;MACzBC,MAAM,EAAEL,YAAY,CAACK,MAAM;MAC3BC,KAAK,EAAEN,YAAY,CAACM,KAAK;MACzBC,OAAO,EAAEb,UAAU,CAACM,YAAY,CAACO,OAAO,CAAC;MACzCC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAEd,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACU,IAAI;MAC5DC,KAAK,EAAEX,YAAY,CAACW,KAAK;MACzBV;IACF,CAAC;IAEL,IAAI,CAACJ,mBAAmB,CAACM,QAAQ,CAAC;EACpC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACES,aAAaA,CACXZ,YAA+B,EAC/BC,QAAgB,EACgB;IAChC,IAAI,CAACD,YAAY,EAAE,OAAOa,SAAS;IAEnC,OAAO;MACLT,KAAK,EAAE,IAAI,CAACF,QAAQ,EAAEE,KAAK,IAAIJ,YAAY,CAACI,KAAK;MACjDC,MAAM,EAAE,IAAI,CAACH,QAAQ,EAAEG,MAAM,IAAIL,YAAY,CAACK,MAAM;MACpDC,KAAK,EAAE,IAAI,CAACJ,QAAQ,EAAEI,KAAK,IAAIN,YAAY,CAACM,KAAK;MACjDC,OAAO,EAAEb,UAAU,CAACM,YAAY,CAACO,OAAO,CAAC;MACzCC,WAAW,EAAER,YAAY,CAACQ,WAAW;MACrCC,OAAO,EAAEd,gBAAgB,CAACK,YAAY,CAAC,IAAIA,YAAY,CAACU,IAAI;MAC5DC,KAAK,EAAEX,YAAY,CAACW,KAAK;MACzBV;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACEa,uBAAuBA,CAAA,EAAS;IAC9B,IAAI,CAACZ,QAAQ,GAAGW,SAAS;EAC3B;AACF","ignoreList":[]}

package/lib/module/web/util/BrowserPathHelper.js

@@ -8,8 +8,12 @@
  * 1. System paths (prefixed with `/__`): Root, recent, and search paths
  * 2. Contextual URLs: Embed parent context in track identifiers for Media3 integration
  *
- * Contextual URL format: `{parentPath}?__trackId={trackSrc}`
- * Example: "/library/radio?__trackId=song.mp3"
+ * Contextual URL format: `{parentPath}?__trackId={trackIdentity}&__index={childIndex}`
+ * Example: "/library/radio?__trackId=song.mp3&__index=2"
+ *
+ * `__trackId` is the identity check; `__index` (the child's position on the
+ * page at stamp time) is only a tie-breaker between surfaces that carry the
+ * same identity — a stale index never selects a different track.
  *
  * This allows:
  * - Media3 to reference playable-only tracks (tracks with `src` but no `url`)
@@ -21,6 +25,14 @@ export const BrowserPathHelper = {
   SEARCH_PATH_PREFIX: '/__search',
   /** Query parameter name for contextual track identifiers */
   CONTEXTUAL_TRACK_PARAM: '__trackId',
+  /** Query parameter name for the tapped child's page position (tie-breaker) */
+  CONTEXTUAL_INDEX_PARAM: '__index',
+  /**
+   * Whether a navigation error on this path came from a browse or a search
+   */
+  navigationErrorKind(path) {
+    return path.startsWith(`${this.SEARCH_PATH_PREFIX}?`) ? 'search' : 'browse';
+  },
   /**
    * Create a search path for a given query
    */
@@ -38,13 +50,13 @@ export const BrowserPathHelper = {
     return path.includes(`?${this.CONTEXTUAL_TRACK_PARAM}=`) || path.includes(`&${this.CONTEXTUAL_TRACK_PARAM}=`);
   },
   /**
-   * Strips the __trackId parameter from a contextual URL to get the parent path.
-   * If the URL is not contextual, returns it unchanged.
+   * Strips the contextual parameters (__trackId and __index) from a contextual
+   * URL to get the parent path. If the URL is not contextual, returns it unchanged.
    *
    * @param url The URL to process
-   * @returns The URL without the __trackId parameter
+   * @returns The URL without the contextual parameters
    *
-   * Example: "/library/radio?__trackId=song.mp3" → "/library/radio"
+   * Example: "/library/radio?__trackId=song.mp3&__index=2" → "/library/radio"
    * Example: "/search?q=jazz&__trackId=song.mp3" → "/search?q=jazz"
    */
   stripTrackId(url) {
@@ -56,8 +68,9 @@ export const BrowserPathHelper = {
       const isFullUrl = url.startsWith('http://') || url.startsWith('https://');
       const urlObj = new URL(url, isFullUrl ? undefined : 'http://placeholder');
 
-      // Remove the __trackId parameter
+      // Remove the contextual parameters
       urlObj.searchParams.delete(this.CONTEXTUAL_TRACK_PARAM);
+      urlObj.searchParams.delete(this.CONTEXTUAL_INDEX_PARAM);
 
       // Return the appropriate format
       if (isFullUrl) {
@@ -68,7 +81,7 @@ export const BrowserPathHelper = {
       }
     } catch {
       // Fallback: simple string manipulation
-      const paramPattern = new RegExp(`[?&]${this.CONTEXTUAL_TRACK_PARAM}=[^&]*`, 'g');
+      const paramPattern = new RegExp(`[?&](?:${this.CONTEXTUAL_TRACK_PARAM}|${this.CONTEXTUAL_INDEX_PARAM})=[^&]*`, 'g');
       let result = url.replace(paramPattern, '');
       // Clean up any trailing ? or &
       result = result.replace(/[?&]$/, '');
@@ -77,6 +90,22 @@ export const BrowserPathHelper = {
       return result;
     }
   },
+  /**
+   * Builds a contextual URL by appending a track identifier — and optionally
+   * the tapped child's page position — to a parent path.
+   *
+   * @param parentPath The parent container path
+   * @param trackId The track identity (`id` when non-blank, else `src`)
+   * @param index The child's position on the page at stamp time (tie-breaker)
+   * @returns A contextual URL combining parent path, track ID, and index
+   *
+   * Example: build("/library", "song.mp3", 2) → "/library?__trackId=song.mp3&__index=2"
+   */
+  build(parentPath, trackId, index) {
+    const separator = parentPath.includes('?') ? '&' : '?';
+    const indexParam = index === undefined ? '' : `&${this.CONTEXTUAL_INDEX_PARAM}=${index}`;
+    return `${parentPath}${separator}${this.CONTEXTUAL_TRACK_PARAM}=${encodeURIComponent(trackId)}${indexParam}`;
+  },
   /**
    * Extracts the track ID from a contextual URL.
    * Returns undefined if the URL is not contextual or doesn't contain the track ID parameter.
@@ -90,14 +119,36 @@ export const BrowserPathHelper = {
     if (!this.isContextual(path)) {
       return undefined;
     }
+    return this.extractParam(path, this.CONTEXTUAL_TRACK_PARAM);
+  },
+  /**
+   * Extracts the stamped page index from a contextual URL, or undefined when
+   * the URL is not contextual or carries no (valid, non-negative) index.
+   *
+   * Example: "/library/radio?__trackId=song.mp3&__index=2" → 2
+   */
+  extractIndex(path) {
+    if (!this.isContextual(path)) {
+      return undefined;
+    }
+    const raw = this.extractParam(path, this.CONTEXTUAL_INDEX_PARAM);
+    if (raw === undefined || !/^\d+$/.test(raw)) {
+      return undefined;
+    }
+    return Number.parseInt(raw, 10);
+  },
+  /**
+   * Extracts a single query parameter, handling both full URLs and paths,
+   * with a regex fallback for input the URL parser rejects.
+   */
+  extractParam(path, param) {
     try {
-      // Parse the URL - handle both full URLs and paths
       const isFullUrl = path.startsWith('http://') || path.startsWith('https://');
       const urlObj = new URL(path, isFullUrl ? undefined : 'http://placeholder');
-      return urlObj.searchParams.get(this.CONTEXTUAL_TRACK_PARAM) ?? undefined;
+      return urlObj.searchParams.get(param) ?? undefined;
     } catch {
       // Fallback: regex extraction
-      const match = path.match(new RegExp(`[?&]${this.CONTEXTUAL_TRACK_PARAM}=([^&]*)`));
+      const match = path.match(new RegExp(`[?&]${param}=([^&]*)`));
       return match?.[1] ? decodeURIComponent(match[1]) : undefined;
     }
   },