react-native-audio-browser 0.2.0-next.2 → 0.2.0-next.21

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

@@ -1,14 +1,17 @@
 "use strict";
 
+import { getTrackIdentity } from '../../utils/getTrackIdentity';
+
 /**
- * Manages favorite state for tracks.
+ * Manages favorite state for tracks, keyed by track identity (`id` when set,
+ * falling back to `src` — see getTrackIdentity / ADR 0008).
  * Matches Android's favorite hydration behavior.
  */
 export class FavoriteManager {
   favorites = new Set();
 
   /**
-   * Sets the favorites cache from an array of track src values.
+   * Sets the favorites cache from an array of track identities.
    * This is typically called when favorites are loaded from storage.
    */
   setFavorites(favorites) {
@@ -16,24 +19,27 @@ export class FavoriteManager {
   }
 
   /**
-   * Checks if a track is favorited based on its src.
+   * Checks if a track is favorited based on its identity.
    */
-  isFavorited(src) {
-    return this.favorites.has(src);
+  isFavorited(track) {
+    const identity = getTrackIdentity(track);
+    return identity !== undefined && this.favorites.has(identity);
   }
 
   /**
-   * Adds a track src to the favorites cache.
+   * Adds a track to the favorites cache under its identity.
    */
-  addFavorite(src) {
-    this.favorites.add(src);
+  addFavorite(track) {
+    const identity = getTrackIdentity(track);
+    if (identity !== undefined) this.favorites.add(identity);
   }
 
   /**
-   * Removes a track src from the favorites cache.
+   * Removes a track from the favorites cache under its identity.
    */
-  removeFavorite(src) {
-    this.favorites.delete(src);
+  removeFavorite(track) {
+    const identity = getTrackIdentity(track);
+    if (identity !== undefined) this.favorites.delete(identity);
   }
 
   /**
@@ -47,8 +53,7 @@ export class FavoriteManager {
     // Don't overwrite API-provided favorites
     if (track.favorited !== undefined && track.favorited !== null) return track;
     if (this.favorites.size === 0) return track;
-    const isFavorited = track.src ? this.favorites.has(track.src) : false;
-    if (!isFavorited) return track;
+    if (!this.isFavorited(track)) return track;
     return {
       ...track,
       favorited: true
@@ -56,19 +61,24 @@ export class FavoriteManager {
   }
 
   /**
-   * Hydrates favorites on all children of a ResolvedTrack.
-   * Matches Android's hydrateChildren behavior.
+   * Hydrates favorites on all tracks of a resolved page.
+   * Matches Android's hydrateChildren behavior. Pages reach hydration
+   * normalized (ADR 0010), so `sections` is the only structure to walk.
    *
-   * @param resolvedTrack ResolvedTrack with children to hydrate
-   * @returns ResolvedTrack with favorited properties set on children
+   * @param resolvedTrack Resolved page to hydrate
+   * @returns Resolved page with favorited properties set on its tracks
    */
   hydrateChildren(resolvedTrack) {
-    const children = resolvedTrack.children;
-    if (!children) return resolvedTrack;
-    const hydratedChildren = children.map(track => this.hydrateFavorite(track));
+    const {
+      sections
+    } = resolvedTrack;
+    if (!sections) return resolvedTrack;
     return {
       ...resolvedTrack,
-      children: hydratedChildren
+      sections: sections.map(section => ({
+        ...section,
+        children: section.children.map(track => this.hydrateFavorite(track))
+      }))
     };
   }
 }

package/lib/module/web/browser/FavoriteManager.js.map

@@ -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,CAAER,KAAK,IAC1C,IAAI,CAACD,eAAe,CAACC,KAAK,CAC5B,CAAC;IACD,OAAO;MACL,GAAGK,aAAa;MAChBC,QAAQ,EAAEC;IACZ,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"names":["getTrackIdentity","FavoriteManager","favorites","Set","setFavorites","isFavorited","track","identity","undefined","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","favorited","size","hydrateChildren","resolvedTrack","sections","map","section","children"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,8BAA8B;;AAE/D;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,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,KAAY,EAAW;IACjC,MAAMC,QAAQ,GAAGP,gBAAgB,CAACM,KAAK,CAAC;IACxC,OAAOC,QAAQ,KAAKC,SAAS,IAAI,IAAI,CAACN,SAAS,CAACO,GAAG,CAACF,QAAQ,CAAC;EAC/D;;EAEA;AACF;AACA;EACEG,WAAWA,CAACJ,KAAY,EAAQ;IAC9B,MAAMC,QAAQ,GAAGP,gBAAgB,CAACM,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKC,SAAS,EAAE,IAAI,CAACN,SAAS,CAACS,GAAG,CAACJ,QAAQ,CAAC;EAC1D;;EAEA;AACF;AACA;EACEK,cAAcA,CAACN,KAAY,EAAQ;IACjC,MAAMC,QAAQ,GAAGP,gBAAgB,CAACM,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKC,SAAS,EAAE,IAAI,CAACN,SAAS,CAACW,MAAM,CAACN,QAAQ,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEO,eAAeA,CAACR,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACS,SAAS,KAAKP,SAAS,IAAIF,KAAK,CAACS,SAAS,KAAK,IAAI,EAAE,OAAOT,KAAK;IAC3E,IAAI,IAAI,CAACJ,SAAS,CAACc,IAAI,KAAK,CAAC,EAAE,OAAOV,KAAK;IAE3C,IAAI,CAAC,IAAI,CAACD,WAAW,CAACC,KAAK,CAAC,EAAE,OAAOA,KAAK;IAE1C,OAAO;MACL,GAAGA,KAAK;MACRS,SAAS,EAAE;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,eAAeA,CAACC,aAA4B,EAAiB;IAC3D,MAAM;MAAEC;IAAS,CAAC,GAAGD,aAAa;IAClC,IAAI,CAACC,QAAQ,EAAE,OAAOD,aAAa;IAEnC,OAAO;MACL,GAAGA,aAAa;MAChBC,QAAQ,EAAEA,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;QACnC,GAAGA,OAAO;QACVC,QAAQ,EAAED,OAAO,CAACC,QAAQ,CAACF,GAAG,CAAEd,KAAK,IAAK,IAAI,CAACQ,eAAe,CAACR,KAAK,CAAC;MACvE,CAAC,CAAC;IACJ,CAAC;EACH;AACF","ignoreList":[]}

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

@@ -17,7 +17,9 @@ export class SearchManager {
    * Matches Android's BrowserManager.search(params: SearchParams) behavior.
    *
    * @param params Search parameters (query is required, other fields optional)
-   * @returns Array of matching tracks
+   * @returns Array of matching tracks — empty only when the source found none
+   * @throws The failure itself: an `Error` carrying a `NavigationErrorType`
+   *   `code` from `HttpClient`, or whatever a `searchCallback` rejected with
    */
   async search(params) {
     // Find __search__ route entry
@@ -47,31 +49,24 @@ export class SearchManager {
 
       // Delegate to the shared layered fetch (request → search) on BrowserManager
       // so the ladder lives in one place.
-      try {
-        results = await this.browserManager.fetchSearchResults(searchRoute.searchConfig, searchQueryParams);
-      } catch (error) {
-        console.error('Search failed:', error);
-        return [];
-      }
+      results = await this.browserManager.fetchSearchResults(searchRoute.searchConfig, searchQueryParams);
     }
 
     // Transform artwork URLs on search results using async method with full Track access
-    const {
-      request: requestConfig,
-      artwork: artworkConfig
-    } = this.browserManager.configuration;
-    if (artworkConfig) {
-      results = await Promise.all(results.map(async track => {
-        const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
-        if (artworkSource && !track.artworkSource) {
-          return {
-            ...track,
-            artworkSource
-          };
-        }
-        return track;
-      }));
-    }
+    // Gated per track inside the resolver, as on Android — a result carrying a
+    // plain `artwork` URL resolves even with no `artwork` config.
+    const requestConfig = await this.browserManager.resolvedRequestConfig();
+    const artworkConfig = this.browserManager.configuration.artwork;
+    results = await Promise.all(results.map(async track => {
+      const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
+      if (artworkSource && !track.artworkSource) {
+        return {
+          ...track,
+          artworkSource
+        };
+      }
+      return track;
+    }));
     return results;
   }
 }

package/lib/module/web/browser/SearchManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["RequestConfigBuilder","SearchManager","constructor","browserManager","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","reference","genre","artist","album","title","playlist","fetchSearchResults","error","console","request","requestConfig","artwork","artworkConfig","Promise","all","map","track","artworkSource","resolveArtworkSourceAsync"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;AAEA,SAASA,oBAAoB,QAAQ,8BAA8B;;AAEnE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CAASC,cAA8B,EAAE;IAAA,KAAhCA,cAA8B,GAA9BA,cAA8B;EAAG;;EAErD;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACH,cAAc,CAACI,aAAa,CAACC,MAAM,EAAEC,IAAI,CAC/DC,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAK,YACpB,CAAC;IACD,IAAI,CAACL,WAAW,EAAE;MAChB,OAAO,EAAE;IACX;IAEA,IAAIM,OAAgB,GAAG,EAAE;;IAEzB;IACA,IAAIN,WAAW,CAACO,cAAc,EAAE;MAC9BD,OAAO,GAAG,MAAMN,WAAW,CAACO,cAAc,CAACR,MAAM,CAAC;IACpD;IACA;IAAA,KACK,IAAIC,WAAW,CAACQ,YAAY,EAAE;MACjC;MACA,MAAMC,iBAAyC,GAAG;QAChDC,CAAC,EAAEX,MAAM,CAACY;MACZ,CAAC;MACD,IAAIZ,MAAM,CAACa,IAAI,EAAEH,iBAAiB,CAACG,IAAI,GAAGb,MAAM,CAACa,IAAI;MACrD,IAAIb,MAAM,CAACc,SAAS,KAAK,IAAI,EAAEJ,iBAAiB,CAACI,SAAS,GAAG,IAAI;MACjE,IAAId,MAAM,CAACe,KAAK,EAAEL,iBAAiB,CAACK,KAAK,GAAGf,MAAM,CAACe,KAAK;MACxD,IAAIf,MAAM,CAACgB,MAAM,EAAEN,iBAAiB,CAACM,MAAM,GAAGhB,MAAM,CAACgB,MAAM;MAC3D,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,KAAK,EAAER,iBAAiB,CAACQ,KAAK,GAAGlB,MAAM,CAACkB,KAAK;MACxD,IAAIlB,MAAM,CAACmB,QAAQ,EAAET,iBAAiB,CAACS,QAAQ,GAAGnB,MAAM,CAACmB,QAAQ;;MAEjE;MACA;MACA,IAAI;QACFZ,OAAO,GAAG,MAAM,IAAI,CAACT,cAAc,CAACsB,kBAAkB,CACpDnB,WAAW,CAACQ,YAAY,EACxBC,iBACF,CAAC;MACH,CAAC,CAAC,OAAOW,KAAK,EAAE;QACdC,OAAO,CAACD,KAAK,CAAC,gBAAgB,EAAEA,KAAK,CAAC;QACtC,OAAO,EAAE;MACX;IACF;;IAEA;IACA,MAAM;MAAEE,OAAO,EAAEC,aAAa;MAAEC,OAAO,EAAEC;IAAc,CAAC,GACtD,IAAI,CAAC5B,cAAc,CAACI,aAAa;IACnC,IAAIwB,aAAa,EAAE;MACjBnB,OAAO,GAAG,MAAMoB,OAAO,CAACC,GAAG,CACzBrB,OAAO,CAACsB,GAAG,CAAC,MAAOC,KAAK,IAAK;QAC3B,MAAMC,aAAa,GACjB,MAAMpC,oBAAoB,CAACqC,yBAAyB,CAClDF,KAAK,EACLN,aAAa,EACbE,aACF,CAAC;QACH,IAAIK,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,OAAOvB,OAAO;EAChB;AACF","ignoreList":[]}
+{"version":3,"names":["RequestConfigBuilder","SearchManager","constructor","browserManager","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","reference","genre","artist","album","title","playlist","fetchSearchResults","requestConfig","resolvedRequestConfig","artworkConfig","artwork","Promise","all","map","track","artworkSource","resolveArtworkSourceAsync"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;AAEA,SAASA,oBAAoB,QAAQ,8BAA8B;;AAEnE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CAASC,cAA8B,EAAE;IAAA,KAAhCA,cAA8B,GAA9BA,cAA8B;EAAG;;EAErD;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACH,cAAc,CAACI,aAAa,CAACC,MAAM,EAAEC,IAAI,CAC/DC,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAK,YACpB,CAAC;IACD,IAAI,CAACL,WAAW,EAAE;MAChB,OAAO,EAAE;IACX;IAEA,IAAIM,OAAgB,GAAG,EAAE;;IAEzB;IACA,IAAIN,WAAW,CAACO,cAAc,EAAE;MAC9BD,OAAO,GAAG,MAAMN,WAAW,CAACO,cAAc,CAACR,MAAM,CAAC;IACpD;IACA;IAAA,KACK,IAAIC,WAAW,CAACQ,YAAY,EAAE;MACjC;MACA,MAAMC,iBAAyC,GAAG;QAChDC,CAAC,EAAEX,MAAM,CAACY;MACZ,CAAC;MACD,IAAIZ,MAAM,CAACa,IAAI,EAAEH,iBAAiB,CAACG,IAAI,GAAGb,MAAM,CAACa,IAAI;MACrD,IAAIb,MAAM,CAACc,SAAS,KAAK,IAAI,EAAEJ,iBAAiB,CAACI,SAAS,GAAG,IAAI;MACjE,IAAId,MAAM,CAACe,KAAK,EAAEL,iBAAiB,CAACK,KAAK,GAAGf,MAAM,CAACe,KAAK;MACxD,IAAIf,MAAM,CAACgB,MAAM,EAAEN,iBAAiB,CAACM,MAAM,GAAGhB,MAAM,CAACgB,MAAM;MAC3D,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,KAAK,EAAER,iBAAiB,CAACQ,KAAK,GAAGlB,MAAM,CAACkB,KAAK;MACxD,IAAIlB,MAAM,CAACmB,QAAQ,EAAET,iBAAiB,CAACS,QAAQ,GAAGnB,MAAM,CAACmB,QAAQ;;MAEjE;MACA;MACAZ,OAAO,GAAG,MAAM,IAAI,CAACT,cAAc,CAACsB,kBAAkB,CACpDnB,WAAW,CAACQ,YAAY,EACxBC,iBACF,CAAC;IACH;;IAEA;IACA;IACA;IACA,MAAMW,aAAa,GAAG,MAAM,IAAI,CAACvB,cAAc,CAACwB,qBAAqB,CAAC,CAAC;IACvE,MAAMC,aAAa,GAAG,IAAI,CAACzB,cAAc,CAACI,aAAa,CAACsB,OAAO;IAC/DjB,OAAO,GAAG,MAAMkB,OAAO,CAACC,GAAG,CACzBnB,OAAO,CAACoB,GAAG,CAAC,MAAOC,KAAK,IAAK;MAC3B,MAAMC,aAAa,GACjB,MAAMlC,oBAAoB,CAACmC,yBAAyB,CAClDF,KAAK,EACLP,aAAa,EACbE,aACF,CAAC;MACH,IAAIM,aAAa,IAAI,CAACD,KAAK,CAACC,aAAa,EAAE;QACzC,OAAO;UAAE,GAAGD,KAAK;UAAEC;QAAc,CAAC;MACpC;MACA,OAAOD,KAAK;IACd,CAAC,CACH,CAAC;IAED,OAAOrB,OAAO;EAChB;AACF","ignoreList":[]}

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

@@ -8,10 +8,10 @@
  */
 export function assertBrowsePageShape(response, path) {
   if (Array.isArray(response)) {
-    throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, children?: Track[] }. Wrap the rows in a ` + `\`children\` array.`);
+    throw new Error(`Browse endpoint for "${path}" returned a JSON array; expected a ` + `page object { title, sections?: Section[], children?: Track[] }. ` + `Wrap the rows in a \`children\` array (one untitled section) or ` + `group them into \`sections\`.`);
   }
   if (response === null || typeof response !== 'object') {
-    throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, children?: Track[] }.`);
+    throw new Error(`Browse endpoint for "${path}" returned ${JSON.stringify(response)}; ` + `expected a page object { title, sections?: Section[], ` + `children?: Track[] }.`);
   }
   return response;
 }

package/lib/module/web/browser/assertBrowsePageShape.js.map

@@ -1 +1 @@
-{"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,gEAAgE,GAChE,qBACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,uDACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}
+{"version":3,"names":["assertBrowsePageShape","response","path","Array","isArray","Error","JSON","stringify"],"sourceRoot":"../../../../src","sources":["web/browser/assertBrowsePageShape.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,QAAiB,EACjBC,IAAY,EACG;EACf,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;IAC3B,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,sCAAsC,GAChE,mEAAmE,GACnE,kEAAkE,GAClE,+BACJ,CAAC;EACH;EACA,IAAID,QAAQ,KAAK,IAAI,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;IACrD,MAAM,IAAII,KAAK,CACb,wBAAwBH,IAAI,cAAcI,IAAI,CAACC,SAAS,CAACN,QAAQ,CAAC,IAAI,GACpE,wDAAwD,GACxD,uBACJ,CAAC;EACH;EACA,OAAOA,QAAQ;AACjB","ignoreList":[]}

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

@@ -5,10 +5,10 @@ import { BrowserPathHelper } from '../util/BrowserPathHelper';
 /**
  * How a selected track should be navigated, decided purely from its shape:
  * - `contextual` — a playable track carrying its parent queue context in a
- *   contextual URL (`{parentPath}?__trackId={src}`); expand/skip within that queue.
- * - `browse` — a browsable track (has a `url` that isn't contextual); drill in.
- * - `playable` — a bare playable track (`src`, no `url`); load and play it alone.
- * - `invalid` — neither `url` nor `src`; nothing to do.
+ *   contextual path (`{parentPath}?__trackId={src}`); expand/skip within that queue.
+ * - `browse` — a browsable track (has a `path` that isn't contextual); drill in.
+ * - `playable` — a bare playable track (`src`, no `path`); load and play it alone.
+ * - `invalid` — neither `path` nor `src`; nothing to do.
  */
 
 /**
@@ -17,15 +17,15 @@ import { BrowserPathHelper } from '../util/BrowserPathHelper';
  * caller; this only decides which action applies.
  */
 export function classifyTrackNavigation(track) {
-  const url = track.url;
-  if (url && BrowserPathHelper.isContextual(url)) {
+  const path = track.path;
+  if (path && BrowserPathHelper.isContextual(path)) {
     return {
       kind: 'contextual',
-      parentPath: BrowserPathHelper.stripTrackId(url),
-      trackId: BrowserPathHelper.extractTrackId(url)
+      parentPath: BrowserPathHelper.stripTrackId(path),
+      trackId: BrowserPathHelper.extractTrackId(path)
     };
   }
-  if (url) return {
+  if (path) return {
     kind: 'browse'
   };
   if (track.src) return {

package/lib/module/web/browser/classifyTrackNavigation.js.map

@@ -1 +1 @@
-{"version":3,"names":["BrowserPathHelper","classifyTrackNavigation","track","url","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;AACA,SAASA,iBAAiB,QAAQ,2BAA2B;;AAE7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,GAAG,GAAGD,KAAK,CAACC,GAAG;EACrB,IAAIA,GAAG,IAAIH,iBAAiB,CAACI,YAAY,CAACD,GAAG,CAAC,EAAE;IAC9C,OAAO;MACLE,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEN,iBAAiB,CAACO,YAAY,CAACJ,GAAG,CAAC;MAC/CK,OAAO,EAAER,iBAAiB,CAACS,cAAc,CAACN,GAAG;IAC/C,CAAC;EACH;EACA,IAAIA,GAAG,EAAE,OAAO;IAAEE,IAAI,EAAE;EAAS,CAAC;EAClC,IAAIH,KAAK,CAACQ,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}
+{"version":3,"names":["BrowserPathHelper","classifyTrackNavigation","track","path","isContextual","kind","parentPath","stripTrackId","trackId","extractTrackId","src"],"sourceRoot":"../../../../src","sources":["web/browser/classifyTrackNavigation.ts"],"mappings":";;AACA,SAASA,iBAAiB,QAAQ,2BAA2B;;AAE7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAOA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,KAAY,EAAmB;EACrE,MAAMC,IAAI,GAAGD,KAAK,CAACC,IAAI;EACvB,IAAIA,IAAI,IAAIH,iBAAiB,CAACI,YAAY,CAACD,IAAI,CAAC,EAAE;IAChD,OAAO;MACLE,IAAI,EAAE,YAAY;MAClBC,UAAU,EAAEN,iBAAiB,CAACO,YAAY,CAACJ,IAAI,CAAC;MAChDK,OAAO,EAAER,iBAAiB,CAACS,cAAc,CAACN,IAAI;IAChD,CAAC;EACH;EACA,IAAIA,IAAI,EAAE,OAAO;IAAEE,IAAI,EAAE;EAAS,CAAC;EACnC,IAAIH,KAAK,CAACQ,GAAG,EAAE,OAAO;IAAEL,IAAI,EAAE;EAAW,CAAC;EAC1C,OAAO;IAAEA,IAAI,EAAE;EAAU,CAAC;AAC5B","ignoreList":[]}

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

@@ -0,0 +1,83 @@
+"use strict";
+
+import { getTrackIdentity } from '../../utils/getTrackIdentity';
+
+/**
+ * Normalizes a resolved page to the canonical sectioned shape (ADR 0010):
+ * `sections` wins when present; plain `children` is authoring sugar for one
+ * untitled section. The output never carries `children` — there is exactly
+ * one structure downstream code hydrates, transforms, and scopes against.
+ */
+export function normalizePage(content) {
+  const {
+    children,
+    sections,
+    ...rest
+  } = content;
+  const normalized = sections ?? (children !== undefined ? [{
+    children
+  }] : undefined);
+  return {
+    ...rest,
+    sections: normalized
+  };
+}
+
+/**
+ * The page's children concatenated in section order — the flattening that
+ * defines the contextual `__index` positions (ADR 0009/0010) and the flat
+ * views (tabs, search) of a sectioned page.
+ */
+export function flattenSections(sections) {
+  return sections?.flatMap(section => section.children) ?? [];
+}
+
+/**
+ * The page's tracks as one flat list, normalizing first — the flat view
+ * (tabs, search) of a page in either authored shape. Mirrors the native
+ * `flattenedChildren` accessors.
+ */
+export function flattenedChildren(page) {
+  return flattenSections(normalizePage(page).sections);
+}
+
+/**
+ * The section of the page containing the playable `trackId` (a track
+ * identity: id when non-blank, else src), or undefined when not found.
+ *
+ * `tappedIndex` — the flat page position stamped into the contextual URL —
+ * is a tie-breaker, never an identifier: when the child at that position
+ * still carries the tapped identity, it pins which section (and which copy,
+ * via `tappedOffset`) was tapped; when it doesn't (the list shifted),
+ * resolution falls back to the first section containing the identity. A
+ * stale index can therefore never select a different track — at worst a
+ * different copy of the same one.
+ */
+export function sectionContaining(sections, trackId, tappedIndex) {
+  if (tappedIndex !== undefined && tappedIndex >= 0) {
+    let start = 0;
+    for (const section of sections) {
+      const offset = tappedIndex - start;
+      if (offset < section.children.length) {
+        const tapped = section.children[offset];
+        if (tapped && getTrackIdentity(tapped) === trackId) {
+          return {
+            tracks: section.children,
+            tappedOffset: offset
+          };
+        }
+        break;
+      }
+      start += section.children.length;
+    }
+  }
+  for (const section of sections) {
+    if (section.children.some(track => getTrackIdentity(track) === trackId)) {
+      return {
+        tracks: section.children
+      };
+    }
+  }
+  return undefined;
+}
+//# sourceMappingURL=sections.js.map

package/lib/module/web/browser/sections.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getTrackIdentity","normalizePage","content","children","sections","rest","normalized","undefined","flattenSections","flatMap","section","flattenedChildren","page","sectionContaining","trackId","tappedIndex","start","offset","length","tapped","tracks","tappedOffset","some","track"],"sourceRoot":"../../../../src","sources":["web/browser/sections.ts"],"mappings":";;AACA,SAASA,gBAAgB,QAAQ,8BAA8B;;AAE/D;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,aAAaA,CAACC,OAAsB,EAAiB;EACnE,MAAM;IAAEC,QAAQ;IAAEC,QAAQ;IAAE,GAAGC;EAAK,CAAC,GAAGH,OAAO;EAC/C,MAAMI,UAAU,GACdF,QAAQ,KAAKD,QAAQ,KAAKI,SAAS,GAAG,CAAC;IAAEJ;EAAS,CAAC,CAAC,GAAGI,SAAS,CAAC;EACnE,OAAO;IAAE,GAAGF,IAAI;IAAED,QAAQ,EAAEE;EAAW,CAAC;AAC1C;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,eAAeA,CAACJ,QAA+B,EAAW;EACxE,OAAOA,QAAQ,EAAEK,OAAO,CAAEC,OAAO,IAAKA,OAAO,CAACP,QAAQ,CAAC,IAAI,EAAE;AAC/D;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASQ,iBAAiBA,CAACC,IAAmB,EAAW;EAC9D,OAAOJ,eAAe,CAACP,aAAa,CAACW,IAAI,CAAC,CAACR,QAAQ,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,iBAAiBA,CAC/BT,QAAmB,EACnBU,OAAe,EACfC,WAA+B,EACyB;EACxD,IAAIA,WAAW,KAAKR,SAAS,IAAIQ,WAAW,IAAI,CAAC,EAAE;IACjD,IAAIC,KAAK,GAAG,CAAC;IACb,KAAK,MAAMN,OAAO,IAAIN,QAAQ,EAAE;MAC9B,MAAMa,MAAM,GAAGF,WAAW,GAAGC,KAAK;MAClC,IAAIC,MAAM,GAAGP,OAAO,CAACP,QAAQ,CAACe,MAAM,EAAE;QACpC,MAAMC,MAAM,GAAGT,OAAO,CAACP,QAAQ,CAACc,MAAM,CAAC;QACvC,IAAIE,MAAM,IAAInB,gBAAgB,CAACmB,MAAM,CAAC,KAAKL,OAAO,EAAE;UAClD,OAAO;YAAEM,MAAM,EAAEV,OAAO,CAACP,QAAQ;YAAEkB,YAAY,EAAEJ;UAAO,CAAC;QAC3D;QACA;MACF;MACAD,KAAK,IAAIN,OAAO,CAACP,QAAQ,CAACe,MAAM;IAClC;EACF;EACA,KAAK,MAAMR,OAAO,IAAIN,QAAQ,EAAE;IAC9B,IAAIM,OAAO,CAACP,QAAQ,CAACmB,IAAI,CAAEC,KAAK,IAAKvB,gBAAgB,CAACuB,KAAK,CAAC,KAAKT,OAAO,CAAC,EAAE;MACzE,OAAO;QAAEM,MAAM,EAAEV,OAAO,CAACP;MAAS,CAAC;IACrC;EACF;EACA,OAAOI,SAAS;AAClB","ignoreList":[]}

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":[]}