react-native-audio-browser 0.2.0-next.11 → 0.2.0-next.13

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

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BrowserManager = void 0;
+var _getTrackIdentity = require("../../utils/getTrackIdentity");
 var _validation = require("../../utils/validation");
 var _RequestConfigBuilder = require("../http/RequestConfigBuilder");
 var _SimpleRouter = require("../SimpleRouter");
 var _BrowserPathHelper = require("../util/BrowserPathHelper");
 var _assertBrowsePageShape = require("./assertBrowsePageShape");
 var _parseSearchResponse = require("./parseSearchResponse");
+var _sections = require("./sections");
 /**
  * Manages browser navigation, route resolution, and content loading.
  * Coordinates between HTTP client, favorite manager, and error manager.
@@ -126,14 +128,11 @@ class BrowserManager {
     // Determine initial path
     let initialPath = value.path;
 
-    // If no path specified, try to get first tab URL
+    // If no path specified, try to get first tab path
     if (!initialPath) {
       const tabsRoute = value.routes?.find(r => r.path === '__tabs__');
-      if (tabsRoute?.browseStatic?.children?.[0]?.url) {
-        initialPath = tabsRoute.browseStatic.children[0].url;
-      } else {
-        initialPath = '/';
-      }
+      const staticTabs = tabsRoute?.browseStatic ? (0, _sections.flattenedChildren)(tabsRoute.browseStatic) : [];
+      initialPath = staticTabs[0]?.path ?? '/';
     }
     if (initialPath) {
       void this.navigate(initialPath);
@@ -149,16 +148,16 @@ class BrowserManager {
   }
 
   /**
-   * Navigates to a track's URL.
+   * Navigates to a track's path.
    */
   async navigateTrack(track) {
     this.navigationErrorManager.clearNavigationError();
-    const url = track.url;
-    if (!url) {
-      console.warn('Track has no URL to navigate to');
+    const path = track.path;
+    if (!path) {
+      console.warn('Track has no path to navigate to');
       return;
     }
-    await this.navigate(url);
+    await this.navigate(path);
   }
 
   /**
@@ -211,28 +210,15 @@ class BrowserManager {
         return;
       }
 
-      // Add contextual URLs to non-search content (matches Android behavior where
-      // search() bypasses the resolve() contextual URL logic).
-      // Shallow copy to avoid mutating the original config object (e.g., browseStatic
-      // from routes), which would break search that reads from the same source.
-      if (content?.children && !isSearchPath) {
+      // Resolution returns canonical sectioned pages; add contextual paths
+      // to non-search content (matches Android behavior where search()
+      // bypasses the resolve() contextual-path logic). Copies avoid mutating
+      // the original config object (e.g., browseStatic from routes), which
+      // would break search that reads from the same source.
+      if (content?.sections && !isSearchPath) {
         content = {
           ...content,
-          children: content.children.map(track => {
-            // If track has src, always add/update contextual URL with current path context
-            // This matches Android's BrowserManager.kt:436-441
-            if (track.src) {
-              const contextualUrl = `${path}?__trackId=${encodeURIComponent(track.src)}`;
-              return {
-                ...track,
-                url: contextualUrl
-              };
-            }
-            // Return a shallow copy in attempt to avoid mutating original config objects
-            return {
-              ...track
-            };
-          })
+          sections: this.addContextualPaths(path, content.sections)
         };
       }
 
@@ -277,13 +263,42 @@ class BrowserManager {
     }
   }
 
+  /**
+   * Stamps contextual paths onto a page's sections. A playable track gets a
+   * contextual path carrying its identity (id ?? src) so the queue can be
+   * re-expanded from it later, plus its flat page position (children
+   * concatenated in section order — ADR 0009/0010) as a duplicate-identity
+   * tie-breaker. Non-playable tracks are shallow-copied to avoid mutating
+   * original config objects (e.g., browseStatic from routes).
+   */
+  addContextualPaths(path, sections) {
+    let index = 0;
+    return sections.map(section => ({
+      ...section,
+      children: section.children.map(track => {
+        const flatIndex = index++;
+        const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
+        if (track.src && identity) {
+          return {
+            ...track,
+            path: _BrowserPathHelper.BrowserPathHelper.build(path, identity, flatIndex)
+          };
+        }
+        return {
+          ...track
+        };
+      })
+    }));
+  }
+
   /**
    * Resolves search content from a search path.
-   * Returns a ResolvedTrack with raw children (no contextual URLs).
+   * Returns a canonical sectioned page — one untitled section of raw search
+   * results (no contextual URLs), like the native `makeSearchResult`.
    * Matches Android's BrowserManager.search() which bypasses resolve() entirely.
    *
    * @param searchPath The search path (format: /__search?q=query)
-   * @returns ResolvedTrack containing search results as children
+   * @returns ResolvedTrack containing search results as one untitled section
    */
   async resolveSearchContent(searchPath) {
     // Extract query from search path
@@ -321,13 +336,12 @@ class BrowserManager {
       }
     }
 
-    // Create ResolvedTrack with raw children
-    // Search callbacks should return fresh tracks without contextual URLs (like Android)
-    return {
-      url: searchPath,
+    // Search callbacks should return fresh tracks without contextual paths (like Android)
+    return (0, _sections.normalizePage)({
+      path: searchPath,
       title: `Search: ${query}`,
       children: searchResults
-    };
+    });
   }
 
   /**
@@ -348,30 +362,35 @@ class BrowserManager {
     // Transform parent artwork
     const parentArtworkSource = await _RequestConfigBuilder.RequestConfigBuilder.resolveArtworkSourceAsync(content, requestConfig, artworkConfig);
 
-    // Transform children artwork
-    let transformedChildren;
-    if (content.children) {
-      transformedChildren = await Promise.all(content.children.map(async track => {
-        const artworkSource = await _RequestConfigBuilder.RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
-        if (artworkSource && !track.artworkSource) {
-          return {
-            ...track,
-            artworkSource
-          };
-        }
-        return track;
-      }));
+    // Transform children artwork, section by section
+    const transformTrack = async track => {
+      const artworkSource = await _RequestConfigBuilder.RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
+      if (artworkSource && !track.artworkSource) {
+        return {
+          ...track,
+          artworkSource
+        };
+      }
+      return track;
+    };
+    let transformedSections;
+    if (content.sections) {
+      transformedSections = await Promise.all(content.sections.map(async section => ({
+        ...section,
+        children: await Promise.all(section.children.map(transformTrack))
+      })));
     }
     return {
       ...content,
       artworkSource: parentArtworkSource ?? content.artworkSource,
-      children: transformedChildren ?? content.children
+      sections: transformedSections ?? content.sections
     };
   }
 
   /**
    * Resolves content from a route using browseCallback, browseStatic, or browseConfig.
-   * Single source of truth for route resolution logic.
+   * Single source of truth for route resolution logic. Returns canonical
+   * sectioned pages (normalizePage) — consumers never see authored `children`.
    *
    * @param route The route configuration to resolve
    * @param path The path being navigated to
@@ -391,19 +410,20 @@ class BrowserManager {
         this.navigationErrorManager.setNavigationError('callback-error', result.error, path);
         return undefined;
       }
-      return result;
+      return (0, _sections.normalizePage)(result);
     }
 
-    // Handle static ResolvedTrack route
+    // Handle static ResolvedTrack route (normalizePage also copies, so the
+    // config object itself is never handed out)
     if (route.browseStatic) {
-      return route.browseStatic;
+      return (0, _sections.normalizePage)(route.browseStatic);
     }
 
     // Handle request config-based route via the layered request → browse → route
     // chain (matches native's resolveRouteEntry → resolveFromConfig).
     if (route.browseConfig) {
       try {
-        return await this.resolveFromConfig(this._configuration.browse, route.browseConfig, path, routeParams);
+        return (0, _sections.normalizePage)(await this.resolveFromConfig(this._configuration.browse, route.browseConfig, path, routeParams));
       } catch (error) {
         console.error(`Failed to resolve ${errorContext}:`, error);
         this.handleNavigationError(error, path);
@@ -492,6 +512,8 @@ class BrowserManager {
 
   /**
    * Resolves content for a specific path using configured routes.
+   * Like the native resolve pipelines, the returned page is canonical
+   * sectioned shape — `children` sugar is normalized away at this seam.
    */
   async resolveContent(path) {
     const routes = this._configuration.routes;
@@ -533,9 +555,9 @@ class BrowserManager {
     // there's no content.
     if (this._configuration.request || this._configuration.requestResolver || this._configuration.browse || this._configuration.browseResolver) {
       try {
-        return await this.resolveFromConfig(this._configuration.browse, undefined, path, {
+        return (0, _sections.normalizePage)(await this.resolveFromConfig(this._configuration.browse, undefined, path, {
           path
-        });
+        }));
       } catch (error) {
         console.error('Failed to resolve default browse content:', error);
         this.handleNavigationError(error, path);
@@ -554,7 +576,8 @@ class BrowserManager {
       return [];
     }
     const result = await this.resolveRouteContent(tabsRoute, '/', {}, 'Tabs');
-    const tabs = result?.children ?? [];
+    // Tabs are a flat list, not a page — a sectioned tabs source flattens.
+    const tabs = result ? (0, _sections.flattenSections)(result.sections) : [];
 
     // Transform artwork URLs on tabs via the async resolver so the shared
     // request layer (incl. its transform) applies, matching content/search.
@@ -585,35 +608,65 @@ class BrowserManager {
   /**
    * Expands a queue from a contextual URL.
    * Resolves the parent container to get all siblings.
-   * Matches Android's BrowserManager.expandQueueFromContextualUrl() behavior.
+   * Matches Android's BrowserManager.expandQueueFromContextualPath() behavior.
    *
-   * @param contextualUrl The contextual URL (format: /path?__trackId=trackSrc)
+   * @param contextualPath The contextual path (format: /path?__trackId=trackSrc)
    * @returns Object with tracks and selectedIndex, or undefined if expansion fails
    */
-  async expandQueueFromContextualUrl(contextualUrl) {
-    const trackId = _BrowserPathHelper.BrowserPathHelper.extractTrackId(contextualUrl);
+  async expandQueueFromContextualPath(contextualPath) {
+    const trackId = _BrowserPathHelper.BrowserPathHelper.extractTrackId(contextualPath);
     if (!trackId) return undefined;
     try {
       // Resolve the parent container to get all siblings
-      const parentPath = _BrowserPathHelper.BrowserPathHelper.stripTrackId(contextualUrl);
+      const parentPath = _BrowserPathHelper.BrowserPathHelper.stripTrackId(contextualPath);
       const parentResolvedTrack = await this.resolveContent(parentPath);
-      const children = parentResolvedTrack?.children;
-      if (!children || children.length === 0) {
+      const rawSections = parentResolvedTrack?.sections;
+      if (!rawSections || rawSections.every(s => s.children.length === 0)) {
         console.warn('Parent has no children, cannot expand queue');
         return undefined;
       }
 
-      // Filter to only playable tracks (tracks with src)
-      const playableTracks = children.filter(track => track.src != null);
+      // Stamp contextual paths so queued tracks carry their own queue context
+      // (navigate() stamps the displayed page the same way).
+      const sections = this.addContextualPaths(parentPath, rawSections);
+
+      // Queue scope is the tapped section, not the whole page (ADR 0006).
+      // The stamped flat index pins which section (and which copy) was
+      // tapped when the same identity appears more than once; a stale index
+      // falls back to the first identity match. An identity that no longer
+      // appears on the page aborts the expansion — the caller falls back to
+      // the single track.
+      const tappedIndex = _BrowserPathHelper.BrowserPathHelper.extractIndex(contextualPath);
+      const scoped = (0, _sections.sectionContaining)(sections, trackId, tappedIndex);
+      if (!scoped) {
+        console.warn(`Track with identity='${trackId}' not found on parent page`);
+        return undefined;
+      }
+
+      // Filter to only playable tracks (tracks with src). A disabled track is
+      // unavailable — queue expansion excludes it, so auto-advance never
+      // meets one (Track.disabled).
+      const isQueueable = track => track.src != null && track.disabled !== true;
+      const playableTracks = scoped.tracks.filter(isQueueable);
       if (playableTracks.length === 0) {
-        console.warn('Parent has no playable tracks, cannot expand queue');
+        console.warn('Section has no playable tracks, cannot expand queue');
         return undefined;
       }
 
-      // Find the index of the selected track in the playable tracks array
-      const selectedIndex = playableTracks.findIndex(track => track.src === trackId);
+      // Selected position: the pinned copy when the stamp survived, else
+      // the first identity match.
+      let selectedIndex = -1;
+      if (scoped.tappedOffset !== undefined) {
+        const tapped = scoped.tracks[scoped.tappedOffset];
+        if (tapped != null && isQueueable(tapped)) {
+          selectedIndex = scoped.tracks.slice(0, scoped.tappedOffset + 1).filter(isQueueable).length - 1;
+        }
+      }
+      if (selectedIndex < 0) {
+        selectedIndex = playableTracks.findIndex(track => (0, _getTrackIdentity.getTrackIdentity)(track) === trackId);
+      }
       if (selectedIndex < 0) {
-        console.warn(`Track with src='${trackId}' not found in playable children`);
+        console.warn(`Track with identity='${trackId}' not found in playable children`);
         return undefined;
       }
 
@@ -629,7 +682,7 @@ class BrowserManager {
         selectedIndex
       };
     } catch (error) {
-      console.error(`Error expanding queue from contextual URL: ${contextualUrl}`, error);
+      console.error(`Error expanding queue from contextual path: ${contextualPath}`, error);
       return undefined;
     }
   }
@@ -646,19 +699,23 @@ class BrowserManager {
    * @returns Object with expanded tracks and starting index
    */
   async resolveMediaItemsForPlayback(tracks, startIndex, startPositionMs, searchQuery) {
-    // Single track: check for search context or contextual URL
+    // Single track: check for search context or contextual path
     if (tracks.length === 1) {
       const track = (0, _validation.assertedNotNullish)(tracks[0]);
-      const trackUrl = track.url;
+      const trackPath = track.path;
 
       // If search query present, expand search results
       if (searchQuery) {
-        // Execute search (will hit cache if already performed)
+        // Execute search (will hit cache if already performed). Disabled
+        // tracks never play, so they never enter a search-built queue
+        // (Track.disabled — mirrors both native platforms).
         const searchResults = await this.resolveSearchContent(_BrowserPathHelper.BrowserPathHelper.createSearchPath(searchQuery));
-        const searchTracks = searchResults?.children;
-        if (searchTracks && searchTracks.length > 0) {
-          // Find the selected track in search results
-          const selectedIdx = searchTracks.findIndex(t => t.url === trackUrl || t.src === track.src);
+        const searchTracks = (0, _sections.flattenSections)(searchResults?.sections).filter(t => t.disabled !== true);
+        if (searchTracks.length > 0) {
+          // Find the selected track in search results by path or identity
+          // (matches Android's three-way mediaId match)
+          const identity = (0, _getTrackIdentity.getTrackIdentity)(track);
+          const selectedIdx = searchTracks.findIndex(t => t.path === trackPath || identity !== undefined && (0, _getTrackIdentity.getTrackIdentity)(t) === identity);
           if (selectedIdx >= 0) {
             return {
               tracks: searchTracks,
@@ -669,14 +726,14 @@ class BrowserManager {
         }
       }
 
-      // Check if contextual URL - expand from parent
+      // Check if contextual path - expand from parent
       // Note: The queueSourcePath optimization is handled by the caller (NativeAudioBrowser.navigateTrackAsync)
       // which has access to the existing queue and can skip to the track directly.
       // This matches Android where MediaSessionCallback handles the optimization before calling
       // BrowserManager.resolveMediaItemsForPlayback.
-      if (trackUrl && _BrowserPathHelper.BrowserPathHelper.isContextual(trackUrl)) {
-        const parentPath = _BrowserPathHelper.BrowserPathHelper.stripTrackId(trackUrl);
-        const expanded = await this.expandQueueFromContextualUrl(trackUrl);
+      if (trackPath && _BrowserPathHelper.BrowserPathHelper.isContextual(trackPath)) {
+        const parentPath = _BrowserPathHelper.BrowserPathHelper.stripTrackId(trackPath);
+        const expanded = await this.expandQueueFromContextualPath(trackPath);
         if (expanded) {
           // Store source path for optimization by caller on next invocation
           this._queueSourcePath = parentPath;
@@ -698,13 +755,13 @@ class BrowserManager {
   }
 
   /**
-   * Gets the default navigation path (first tab URL or '/').
+   * Gets the default navigation path (first tab path or '/').
    */
   getDefaultPath() {
     // Try to get first tab as default path
     if (this._tabs && this._tabs.length > 0) {
       const firstTab = this._tabs[0];
-      return firstTab?.url ?? '/';
+      return firstTab?.path ?? '/';
     }
     return '/';
   }

package/lib/commonjs/web/browser/BrowserManager.js.map

@@ -1 +1 @@
-{"version":3,"names":["_validation","require","_RequestConfigBuilder","_SimpleRouter","_BrowserPathHelper","_assertBrowsePageShape","_parseSearchResponse","BrowserManager","_configuration","router","SimpleRouter","_layerGeneration","_resolvedLayerGeneration","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","initialPath","tabsRoute","routes","find","r","browseStatic","children","url","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","BrowserPathHelper","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","map","src","contextualUrl","encodeURIComponent","hydrateChildren","transformArtworkForContent","queryTabs","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","RequestConfigBuilder","resolveArtworkSourceAsync","transformedChildren","Promise","all","artworkSource","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","_layerResolution","generation","promise","cfg","resolvedRequest","requestResolver","request","resolvedBrowse","browseResolver","_resolvedBrowse","catch","err","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","assertBrowsePageShape","queryParams","parseSearchResponse","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","assertedNotNullish","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab","exports"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_getTrackIdentity","require","_validation","_RequestConfigBuilder","_SimpleRouter","_BrowserPathHelper","_assertBrowsePageShape","_parseSearchResponse","_sections","BrowserManager","_configuration","router","SimpleRouter","_layerGeneration","_resolvedLayerGeneration","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","initialPath","tabsRoute","routes","find","r","staticTabs","browseStatic","flattenedChildren","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","invalidateAllContent","navigationId","undefined","isSearchPath","startsWith","BrowserPathHelper","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","sections","addContextualPaths","hydrateChildren","transformArtworkForContent","queryTabs","index","map","section","children","flatIndex","identity","getTrackIdentity","src","build","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","reference","searchConfig","fetchSearchResults","q","normalizePage","title","artworkConfig","artwork","ensureLayersResolved","requestConfig","_resolvedRequest","parentArtworkSource","RequestConfigBuilder","resolveArtworkSourceAsync","transformTrack","artworkSource","transformedSections","Promise","all","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","resolveFromConfig","browse","_layerResolution","generation","promise","cfg","resolvedRequest","requestResolver","request","resolvedBrowse","browseResolver","_resolvedBrowse","catch","err","kindConfig","routeConfig","params","merged","applyLayers","response","executeRequest","assertBrowsePageShape","queryParams","parseSearchResponse","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","flattenSections","expandQueueFromContextualPath","contextualPath","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","rawSections","every","s","tappedIndex","extractIndex","scoped","sectionContaining","isQueueable","disabled","playableTracks","tracks","filter","selectedIndex","tappedOffset","tapped","slice","findIndex","singleTrack","assertedNotNullish","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackPath","createSearchPath","searchTracks","t","selectedIdx","isContextual","expanded","firstTab","exports"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}

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

@@ -4,15 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FavoriteManager = void 0;
+var _getTrackIdentity = require("../../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.
  */
 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) {
@@ -20,24 +22,27 @@ 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 = (0, _getTrackIdentity.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 = (0, _getTrackIdentity.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 = (0, _getTrackIdentity.getTrackIdentity)(track);
+    if (identity !== undefined) this.favorites.delete(identity);
   }
 
   /**
@@ -51,8 +56,7 @@ 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
@@ -60,19 +64,24 @@ 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/commonjs/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","exports"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACO,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;AAACE,OAAA,CAAArB,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["_getTrackIdentity","require","FavoriteManager","favorites","Set","setFavorites","isFavorited","track","identity","getTrackIdentity","undefined","has","addFavorite","add","removeFavorite","delete","hydrateFavorite","favorited","size","hydrateChildren","resolvedTrack","sections","map","section","children","exports"],"sourceRoot":"../../../../src","sources":["web/browser/FavoriteManager.ts"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,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,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,OAAOC,QAAQ,KAAKE,SAAS,IAAI,IAAI,CAACP,SAAS,CAACQ,GAAG,CAACH,QAAQ,CAAC;EAC/D;;EAEA;AACF;AACA;EACEI,WAAWA,CAACL,KAAY,EAAQ;IAC9B,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKE,SAAS,EAAE,IAAI,CAACP,SAAS,CAACU,GAAG,CAACL,QAAQ,CAAC;EAC1D;;EAEA;AACF;AACA;EACEM,cAAcA,CAACP,KAAY,EAAQ;IACjC,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,IAAIC,QAAQ,KAAKE,SAAS,EAAE,IAAI,CAACP,SAAS,CAACY,MAAM,CAACP,QAAQ,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEQ,eAAeA,CAACT,KAAY,EAAS;IACnC;IACA,IAAIA,KAAK,CAACU,SAAS,KAAKP,SAAS,IAAIH,KAAK,CAACU,SAAS,KAAK,IAAI,EAAE,OAAOV,KAAK;IAC3E,IAAI,IAAI,CAACJ,SAAS,CAACe,IAAI,KAAK,CAAC,EAAE,OAAOX,KAAK;IAE3C,IAAI,CAAC,IAAI,CAACD,WAAW,CAACC,KAAK,CAAC,EAAE,OAAOA,KAAK;IAE1C,OAAO;MACL,GAAGA,KAAK;MACRU,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,CAAEf,KAAK,IAAK,IAAI,CAACS,eAAe,CAACT,KAAK,CAAC;MACvE,CAAC,CAAC;IACJ,CAAC;EACH;AACF;AAACkB,OAAA,CAAAvB,eAAA,GAAAA,eAAA","ignoreList":[]}

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

@@ -12,10 +12,10 @@ exports.assertBrowsePageShape = assertBrowsePageShape;
  */
 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;
 }