react-native-audio-browser 0.2.0-next.9 → 0.2.0

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

@@ -4,8 +4,6 @@ import { assertedNotNullish } from '../../utils/validation';
 import { RequestConfigBuilder } from '../http/RequestConfigBuilder';
 import { SimpleRouter } from '../SimpleRouter';
 import { BrowserPathHelper } from '../util/BrowserPathHelper';
-import { assertBrowsePageShape } from './assertBrowsePageShape';
-import { parseSearchResponse } from './parseSearchResponse';
 
 /**
  * Manages browser navigation, route resolution, and content loading.
@@ -16,17 +14,6 @@ export class BrowserManager {
   _configuration = {};
   router = new SimpleRouter();
 
-  // Layer resolution: any present request/browse resolver is invoked once per
-  // content generation, and the resolved TransformableRequestConfig is cached
-  // and fed into applyLayers in place of the static request/browse config. The
-  // generation bumps on config-set and on invalidateAllContent().
-  _layerGeneration = 0;
-  _resolvedLayerGeneration = -1;
-
-  // Dedupes concurrent resolution within a generation (config-set triggers an
-  // initial navigate that can overlap with an explicit navigatePath), so a
-  // resolver is invoked exactly once per generation even under concurrency.
-
   // Navigation tracking to prevent race conditions (matches Android's @Volatile currentNavigationId)
   currentNavigationId = 0;
 
@@ -116,10 +103,14 @@ export class BrowserManager {
    */
   set configuration(value) {
     this._configuration = value;
-    this._layerGeneration += 1;
     this.navigationErrorManager.clearNavigationError();
     this.navigationErrorManager.setFormatCallback(value.formatNavigationError);
 
+    // Update HTTP client base config
+    if (value.request) {
+      this.httpClient.setBaseRequestConfig(value.request);
+    }
+
     // Determine initial path
     let initialPath = value.path;
 
@@ -168,18 +159,6 @@ export class BrowserManager {
     }
   }
 
-  /**
-   * Invalidates all browse content. Web shows a single path at a time and
-   * doesn't keep a content cache, so this just re-navigates the current path
-   * to re-resolve it.
-   */
-  invalidateAllContent() {
-    this._layerGeneration += 1;
-    if (this._path) {
-      void this.navigate(this._path);
-    }
-  }
-
   /**
    * Main navigation logic.
    * Resolves content for the given path and updates state.
@@ -302,16 +281,20 @@ export class BrowserManager {
     // Handle callback-based search
     if (searchRoute.searchCallback) {
       searchResults = await searchRoute.searchCallback({
-        query,
-        reference: 'unknown'
+        query
       });
     }
-    // Handle request config-based search via the shared layered fetch.
+    // Handle request config-based search
     else if (searchRoute.searchConfig) {
+      const searchQueryParams = {
+        q: query
+      };
+      const requestConfig = this.httpClient.mergeRequestConfig(searchRoute.searchConfig, {
+        query: searchQueryParams
+      });
       try {
-        searchResults = await this.fetchSearchResults(searchRoute.searchConfig, {
-          q: query
-        });
+        const response = await this.httpClient.executeRequest(requestConfig);
+        searchResults = Array.isArray(response) ? response : [];
       } catch (error) {
         console.error('Search failed:', error);
         return undefined;
@@ -337,19 +320,15 @@ export class BrowserManager {
     if (!artworkConfig) {
       return content;
     }
-    // The shared request layer applies to artwork too — use the resolved layer
-    // (resolver result or static config) so a resolver-only config still works.
-    await this.ensureLayersResolved();
-    const requestConfig = this._resolvedRequest;
 
     // Transform parent artwork
-    const parentArtworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(content, requestConfig, artworkConfig);
+    const parentArtworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(content, artworkConfig);
 
     // Transform children artwork
     let transformedChildren;
     if (content.children) {
       transformedChildren = await Promise.all(content.children.map(async track => {
-        const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
+        const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, artworkConfig);
         if (artworkSource && !track.artworkSource) {
           return {
             ...track,
@@ -396,11 +375,14 @@ export class BrowserManager {
       return route.browseStatic;
     }
 
-    // Handle request config-based route via the layered request → browse → route
-    // chain (matches native's resolveRouteEntry → resolveFromConfig).
+    // Handle request config-based route
     if (route.browseConfig) {
+      const requestConfig = this.httpClient.mergeRequestConfig(route.browseConfig, {
+        path
+      });
       try {
-        return await this.resolveFromConfig(this._configuration.browse, route.browseConfig, path, routeParams);
+        const response = await this.httpClient.executeRequest(requestConfig);
+        return response;
       } catch (error) {
         console.error(`Failed to resolve ${errorContext}:`, error);
         this.handleNavigationError(error, path);
@@ -410,134 +392,41 @@ export class BrowserManager {
     return undefined;
   }
 
-  /**
-   * Ensures the request/browse layer configs are resolved for the current
-   * generation. Any present resolver is invoked once per generation and the
-   * result cached; a static config (no resolver) passes through unchanged.
-   */
-  async ensureLayersResolved() {
-    if (this._resolvedLayerGeneration === this._layerGeneration) return;
-    // Reuse an in-flight resolution for the same generation so concurrent
-    // navigations (e.g. config-set's initial navigate overlapping an explicit
-    // navigatePath) don't each invoke the resolver.
-    if (this._layerResolution?.generation === this._layerGeneration) {
-      return this._layerResolution.promise;
-    }
-    const generation = this._layerGeneration;
-    const promise = (async () => {
-      const cfg = this._configuration;
-      const resolvedRequest = cfg.requestResolver ? await cfg.requestResolver() : cfg.request;
-      const resolvedBrowse = cfg.browseResolver ? await cfg.browseResolver() : cfg.browse;
-      // Only commit if no newer generation superseded us mid-resolution.
-      if (this._layerGeneration === generation) {
-        this._resolvedRequest = resolvedRequest;
-        this._resolvedBrowse = resolvedBrowse;
-        this._resolvedLayerGeneration = generation;
-      }
-    })().catch(err => {
-      // A failed resolution must not wedge the generation — clear the in-flight
-      // cache so the next navigation retries (e.g. a transient async resolver error).
-      if (this._layerResolution?.generation === generation) {
-        this._layerResolution = undefined;
-      }
-      throw err;
-    });
-    this._layerResolution = {
-      generation,
-      promise
-    };
-    return promise;
-  }
-
-  /**
-   * Resolves content from the layered request config chain:
-   * `request` (shared) → `kindConfig` (browse/search) → `routeConfig` (route).
-   * Each layer's transform receives the previous layer's output; a layer with no
-   * transform merges its static fields. `routeConfig` is undefined for the
-   * implicit browse default; `kindConfig` is undefined for search.
-   *
-   * Mirrors native's BrowserManager.resolveFromConfig.
-   */
-  async resolveFromConfig(kindConfig, routeConfig, path, params) {
-    await this.ensureLayersResolved();
-    const merged = await RequestConfigBuilder.applyLayers({
-      path
-    }, [this._resolvedRequest,
-    // fall back to the route's kind config when no browse layer is configured
-    this._resolvedBrowse ?? kindConfig, routeConfig], params);
-    const response = await this.httpClient.executeRequest(merged);
-    return assertBrowsePageShape(response, path);
-  }
-
-  /**
-   * Fetches search results from a `searchConfig` via the layered
-   * `request → search` chain (search is its own kind — no browse layer). The
-   * query params are seeded on the base so they survive both the static merge
-   * and a search `transform`. Shared by `resolveSearchContent` (navigating to a
-   * search path) and `SearchManager` (the voice/`onSearch` API), so the ladder
-   * isn't duplicated. Errors propagate to the caller.
-   */
-  async fetchSearchResults(searchConfig, queryParams) {
-    await this.ensureLayersResolved();
-    const merged = await RequestConfigBuilder.applyLayers({
-      path: searchConfig.path,
-      query: queryParams
-    }, [this._resolvedRequest, searchConfig], queryParams);
-    const response = await this.httpClient.executeRequest(merged);
-    return parseSearchResponse(response);
-  }
-
   /**
    * Resolves content for a specific path using configured routes.
    */
   async resolveContent(path) {
     const routes = this._configuration.routes;
-    if (routes && routes.length > 0) {
-      // Convert routes array to record for SimpleRouter
-      const routePatterns = {};
-      for (const route of routes) {
-        // Skip special routes
-        if (route.path.startsWith('__')) continue;
-        routePatterns[route.path] = {
-          browseCallback: route.browseCallback,
-          browseConfig: route.browseConfig,
-          browseStatic: route.browseStatic
-        };
-      }
+    if (!routes || routes.length === 0) {
+      return undefined;
+    }
 
-      // Try to match route
-      const match = this.router.findBestMatch(path, routePatterns);
-      if (match) {
-        const [matchedPattern, routeMatch] = match;
-        const matchedRoute = routes.find(r => r.path === matchedPattern);
-        if (matchedRoute) {
-          return this.resolveRouteContent(matchedRoute, path, routeMatch.params, 'Route');
-        }
-      }
+    // Convert routes array to record for SimpleRouter
+    const routePatterns = {};
+    for (const route of routes) {
+      // Skip special routes
+      if (route.path.startsWith('__')) continue;
+      routePatterns[route.path] = {
+        browseCallback: route.browseCallback,
+        browseConfig: route.browseConfig,
+        browseStatic: route.browseStatic
+      };
+    }
 
-      // Fall back to the custom __default__ route ('*') if configured
-      const defaultRoute = routes.find(r => r.path === '__default__');
-      if (defaultRoute) {
-        return this.resolveRouteContent(defaultRoute, path, {
-          path
-        }, 'Default route');
+    // Try to match route
+    const match = this.router.findBestMatch(path, routePatterns);
+    if (match) {
+      const [matchedPattern, routeMatch] = match;
+      const matchedRoute = routes.find(r => r.path === matchedPattern);
+      if (matchedRoute) {
+        return this.resolveRouteContent(matchedRoute, path, routeMatch.params, 'Route');
       }
     }
 
-    // Implicit default — no matching route, fetch the path via the layered
-    // request → browse chain. Only attempt this when there's something to fetch
-    // (a configured request or browse layer, static or resolver); otherwise
-    // 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, {
-          path
-        });
-      } catch (error) {
-        console.error('Failed to resolve default browse content:', error);
-        this.handleNavigationError(error, path);
-        return undefined;
-      }
+    // Fall back to __default__ route
+    const defaultRoute = routes.find(r => r.path === '__default__');
+    if (defaultRoute) {
+      return this.resolveRouteContent(defaultRoute, path, {}, 'Default route');
     }
     return undefined;
   }
@@ -553,23 +442,8 @@ export class BrowserManager {
     const result = await this.resolveRouteContent(tabsRoute, '/', {}, 'Tabs');
     const tabs = result?.children ?? [];
 
-    // Transform artwork URLs on tabs via the async resolver so the shared
-    // request layer (incl. its transform) applies, matching content/search.
-    const artworkConfig = this._configuration.artwork;
-    if (!artworkConfig) return tabs;
-    // Resolved request layer (resolver or static), matching content/search.
-    await this.ensureLayersResolved();
-    const requestConfig = this._resolvedRequest;
-    return Promise.all(tabs.map(async track => {
-      const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
-      if (artworkSource && !track.artworkSource) {
-        return {
-          ...track,
-          artworkSource
-        };
-      }
-      return track;
-    }));
+    // Transform artwork URLs on tabs
+    return RequestConfigBuilder.transformTracksArtwork(tabs, this._configuration.artwork);
   }
 
   /**

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

@@ -1 +1 @@
-{"version":3,"names":["assertedNotNullish","RequestConfigBuilder","SimpleRouter","BrowserPathHelper","assertBrowsePageShape","parseSearchResponse","BrowserManager","_configuration","router","_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","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","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","queryParams","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","defaultRoute","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["assertedNotNullish","RequestConfigBuilder","SimpleRouter","BrowserPathHelper","BrowserManager","_configuration","router","currentNavigationId","onPathChanged","onContentChanged","onTabsChanged","constructor","httpClient","favoriteManager","navigationErrorManager","handleNavigationError","error","path","message","navError","setNavigationError","code","statusCode","_path","value","hasValidConfiguration","clearNavigationError","pathToNavigate","getDefaultPath","navigate","tabs","_tabs","content","_content","configuration","queueSourcePath","_queueSourcePath","setFormatCallback","formatNavigationError","request","setBaseRequestConfig","initialPath","tabsRoute","routes","find","r","browseStatic","children","url","navigatePath","navigateTrack","track","console","warn","notifyContentChanged","navigationId","undefined","isSearchPath","startsWith","SEARCH_PATH_PREFIX","resolveSearchContent","resolveContent","map","src","contextualUrl","encodeURIComponent","hydrateChildren","transformArtworkForContent","queryTabs","searchPath","queryMatch","match","query","decodeURIComponent","searchRoute","searchResults","searchCallback","searchConfig","searchQueryParams","q","requestConfig","mergeRequestConfig","response","executeRequest","Array","isArray","title","artworkConfig","artwork","parentArtworkSource","resolveArtworkSourceAsync","transformedChildren","Promise","all","artworkSource","resolveRouteContent","route","routeParams","errorContext","browseCallback","result","browseConfig","length","routePatterns","findBestMatch","matchedPattern","routeMatch","matchedRoute","params","defaultRoute","transformTracksArtwork","expandQueueFromContextualUrl","trackId","extractTrackId","parentPath","stripTrackId","parentResolvedTrack","playableTracks","filter","selectedIndex","findIndex","singleTrack","tracks","resolveMediaItemsForPlayback","startIndex","startPositionMs","searchQuery","trackUrl","createSearchPath","searchTracks","selectedIdx","t","isContextual","expanded","firstTab"],"sourceRoot":"../../../../src","sources":["web/browser/BrowserManager.ts"],"mappings":"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","ignoreList":[]}

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

@@ -5,9 +5,7 @@ const ERROR_TITLES = {
   'http-error': 'Server Error',
   'content-not-found': 'Content Not Found',
   'callback-error': 'Error',
-  'unknown-error': 'Error',
-  'empty-content': 'Nothing here',
-  'timeout': "Couldn't load"
+  'unknown-error': 'Error'
 };
 
 /**

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

@@ -1 +1 @@
-{"version":3,"names":["ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","console","getNavigationError","getFormattedNavigationError"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;AAQA,MAAMA,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE,OAAO;EACxB,eAAe,EAAE,cAAc;EAC/B,SAAS,EAAE;AACb,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ;QACF,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACdW,OAAO,CAACX,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEa,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAACf,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEgB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAACd,yBAAyB;EACvC;AACF","ignoreList":[]}
+{"version":3,"names":["ERROR_TITLES","NavigationErrorManager","onNavigationError","onFormattedNavigationError","setFormatCallback","callback","formatCallback","clearNavigationError","_navigationError","undefined","_formattedNavigationError","error","setNavigationError","code","message","path","statusCode","navError","statusCodeSuccess","defaultFormatted","title","customFormatted","console","getNavigationError","getFormattedNavigationError"],"sourceRoot":"../../../../src","sources":["web/browser/NavigationErrorManager.ts"],"mappings":";;AAQA,MAAMA,YAAiD,GAAG;EACxD,eAAe,EAAE,eAAe;EAChC,YAAY,EAAE,cAAc;EAC5B,mBAAmB,EAAE,mBAAmB;EACxC,gBAAgB,EAAE,OAAO;EACzB,eAAe,EAAE;AACnB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,CAAC;EAKlC;EACAC,iBAAiB,GAAyCA,CAAA,KAAM,CAAC,CAAC;EAClEC,0BAA0B,GAEdA,CAAA,KAAM,CAAC,CAAC;;EAEpB;AACF;AACA;EACEC,iBAAiBA,CACfC,QAA6D,EACvD;IACN,IAAI,CAACC,cAAc,GAAGD,QAAQ;EAChC;;EAEA;AACF;AACA;EACEE,oBAAoBA,CAAA,EAAS;IAC3B,IACE,IAAI,CAACC,gBAAgB,KAAKC,SAAS,IACnC,IAAI,CAACC,yBAAyB,KAAKD,SAAS,EAC5C;MACA,IAAI,CAACD,gBAAgB,GAAGC,SAAS;MACjC,IAAI,CAACC,yBAAyB,GAAGD,SAAS;MAC1C,IAAI,CAACP,iBAAiB,CAAC;QAAES,KAAK,EAAEF;MAAU,CAAC,CAAC;MAC5C,IAAI,CAACN,0BAA0B,CAACM,SAAS,CAAC;IAC5C;EACF;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEG,kBAAkBA,CAChBC,IAAyB,EACzBC,OAAe,EACfC,IAAa,EACbC,UAAmB,EACb;IACN,MAAMC,QAAyB,GAAG;MAChCJ,IAAI;MACJC,OAAO;MACPE,UAAU;MACVE,iBAAiB,EAAET;IACrB,CAAC;IACD,IAAI,CAACD,gBAAgB,GAAGS,QAAQ;IAChC,IAAI,CAACf,iBAAiB,CAAC;MAAES,KAAK,EAAEM;IAAS,CAAC,CAAC;;IAE3C;IACA,MAAME,gBAA0C,GAAG;MACjDC,KAAK,EAAEpB,YAAY,CAACa,IAAI,CAAC;MACzBC;IACF,CAAC;;IAED;IACA,IAAI,IAAI,CAACR,cAAc,IAAIS,IAAI,EAAE;MAC/B,IAAI;QACF,MAAMM,eAAe,GAAG,IAAI,CAACf,cAAc,CAAC;UAC1CK,KAAK,EAAEM,QAAQ;UACfE,gBAAgB;UAChBJ;QACF,CAAC,CAAC;QACF,IAAI,CAACL,yBAAyB,GAAGW,eAAe,IAAIF,gBAAgB;MACtE,CAAC,CAAC,OAAOR,KAAK,EAAE;QACdW,OAAO,CAACX,KAAK,CAAC,0CAA0C,EAAEA,KAAK,CAAC;QAChE,IAAI,CAACD,yBAAyB,GAAGS,gBAAgB;MACnD;IACF,CAAC,MAAM;MACL,IAAI,CAACT,yBAAyB,GAAGS,gBAAgB;IACnD;IAEA,IAAI,CAAChB,0BAA0B,CAAC,IAAI,CAACO,yBAAyB,CAAC;EACjE;;EAEA;AACF;AACA;EACEa,kBAAkBA,CAAA,EAAgC;IAChD,OAAO,IAAI,CAACf,gBAAgB;EAC9B;;EAEA;AACF;AACA;EACEgB,2BAA2BA,CAAA,EAAyC;IAClE,OAAO,IAAI,CAACd,yBAAyB;EACvC;AACF","ignoreList":[]}

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

@@ -8,8 +8,9 @@ import { RequestConfigBuilder } from '../http/RequestConfigBuilder';
  * Matches Android's search architecture.
  */
 export class SearchManager {
-  constructor(browserManager) {
+  constructor(browserManager, httpClient) {
     this.browserManager = browserManager;
+    this.httpClient = httpClient;
   }
 
   /**
@@ -38,17 +39,17 @@ export class SearchManager {
         q: params.query
       };
       if (params.mode) searchQueryParams.mode = params.mode;
-      if (params.reference === 'my') searchQueryParams.reference = 'my';
       if (params.genre) searchQueryParams.genre = params.genre;
       if (params.artist) searchQueryParams.artist = params.artist;
       if (params.album) searchQueryParams.album = params.album;
       if (params.title) searchQueryParams.title = params.title;
       if (params.playlist) searchQueryParams.playlist = params.playlist;
-
-      // Delegate to the shared layered fetch (request → search) on BrowserManager
-      // so the ladder lives in one place.
+      const requestConfig = this.httpClient.mergeRequestConfig(searchRoute.searchConfig, {
+        query: searchQueryParams
+      });
       try {
-        results = await this.browserManager.fetchSearchResults(searchRoute.searchConfig, searchQueryParams);
+        const response = await this.httpClient.executeRequest(requestConfig);
+        results = Array.isArray(response) ? response : [];
       } catch (error) {
         console.error('Search failed:', error);
         return [];
@@ -56,13 +57,10 @@ export class SearchManager {
     }
 
     // Transform artwork URLs on search results using async method with full Track access
-    const {
-      request: requestConfig,
-      artwork: artworkConfig
-    } = this.browserManager.configuration;
+    const artworkConfig = this.browserManager.configuration.artwork;
     if (artworkConfig) {
       results = await Promise.all(results.map(async track => {
-        const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, requestConfig, artworkConfig);
+        const artworkSource = await RequestConfigBuilder.resolveArtworkSourceAsync(track, artworkConfig);
         if (artworkSource && !track.artworkSource) {
           return {
             ...track,

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","httpClient","search","params","searchRoute","configuration","routes","find","r","path","results","searchCallback","searchConfig","searchQueryParams","q","query","mode","genre","artist","album","title","playlist","requestConfig","mergeRequestConfig","response","executeRequest","Array","isArray","error","console","artworkConfig","artwork","Promise","all","map","track","artworkSource","resolveArtworkSourceAsync"],"sourceRoot":"../../../../src","sources":["web/browser/SearchManager.ts"],"mappings":";;AAGA,SAASA,oBAAoB,QAAQ,8BAA8B;;AAEnE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,aAAa,CAAC;EACzBC,WAAWA,CACDC,cAA8B,EAC9BC,UAAsB,EAC9B;IAAA,KAFQD,cAA8B,GAA9BA,cAA8B;IAAA,KAC9BC,UAAsB,GAAtBA,UAAsB;EAC7B;;EAEH;AACF;AACA;AACA;AACA;AACA;AACA;EACE,MAAMC,MAAMA,CAACC,MAAoB,EAAoB;IACnD;IACA,MAAMC,WAAW,GAAG,IAAI,CAACJ,cAAc,CAACK,aAAa,CAACC,MAAM,EAAEC,IAAI,CAC/DC,CAAC,IAAKA,CAAC,CAACC,IAAI,KAAK,YACpB,CAAC;IACD,IAAI,CAACL,WAAW,EAAE;MAChB,OAAO,EAAE;IACX;IAEA,IAAIM,OAAgB,GAAG,EAAE;;IAEzB;IACA,IAAIN,WAAW,CAACO,cAAc,EAAE;MAC9BD,OAAO,GAAG,MAAMN,WAAW,CAACO,cAAc,CAACR,MAAM,CAAC;IACpD;IACA;IAAA,KACK,IAAIC,WAAW,CAACQ,YAAY,EAAE;MACjC;MACA,MAAMC,iBAAyC,GAAG;QAChDC,CAAC,EAAEX,MAAM,CAACY;MACZ,CAAC;MACD,IAAIZ,MAAM,CAACa,IAAI,EAAEH,iBAAiB,CAACG,IAAI,GAAGb,MAAM,CAACa,IAAI;MACrD,IAAIb,MAAM,CAACc,KAAK,EAAEJ,iBAAiB,CAACI,KAAK,GAAGd,MAAM,CAACc,KAAK;MACxD,IAAId,MAAM,CAACe,MAAM,EAAEL,iBAAiB,CAACK,MAAM,GAAGf,MAAM,CAACe,MAAM;MAC3D,IAAIf,MAAM,CAACgB,KAAK,EAAEN,iBAAiB,CAACM,KAAK,GAAGhB,MAAM,CAACgB,KAAK;MACxD,IAAIhB,MAAM,CAACiB,KAAK,EAAEP,iBAAiB,CAACO,KAAK,GAAGjB,MAAM,CAACiB,KAAK;MACxD,IAAIjB,MAAM,CAACkB,QAAQ,EAAER,iBAAiB,CAACQ,QAAQ,GAAGlB,MAAM,CAACkB,QAAQ;MAEjE,MAAMC,aAAa,GAAG,IAAI,CAACrB,UAAU,CAACsB,kBAAkB,CACtDnB,WAAW,CAACQ,YAAY,EACxB;QACEG,KAAK,EAAEF;MACT,CACF,CAAC;MAED,IAAI;QACF,MAAMW,QAAQ,GAAG,MAAM,IAAI,CAACvB,UAAU,CAACwB,cAAc,CAACH,aAAa,CAAC;QACpEZ,OAAO,GAAGgB,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,GAAIA,QAAQ,GAAe,EAAE;MAChE,CAAC,CAAC,OAAOI,KAAK,EAAE;QACdC,OAAO,CAACD,KAAK,CAAC,gBAAgB,EAAEA,KAAK,CAAC;QACtC,OAAO,EAAE;MACX;IACF;;IAEA;IACA,MAAME,aAAa,GAAG,IAAI,CAAC9B,cAAc,CAACK,aAAa,CAAC0B,OAAO;IAC/D,IAAID,aAAa,EAAE;MACjBpB,OAAO,GAAG,MAAMsB,OAAO,CAACC,GAAG,CACzBvB,OAAO,CAACwB,GAAG,CAAC,MAAOC,KAAK,IAAK;QAC3B,MAAMC,aAAa,GACjB,MAAMvC,oBAAoB,CAACwC,yBAAyB,CAClDF,KAAK,EACLL,aACF,CAAC;QACH,IAAIM,aAAa,IAAI,CAACD,KAAK,CAACC,aAAa,EAAE;UACzC,OAAO;YAAE,GAAGD,KAAK;YAAEC;UAAc,CAAC;QACpC;QACA,OAAOD,KAAK;MACd,CAAC,CACH,CAAC;IACH;IAEA,OAAOzB,OAAO;EAChB;AACF","ignoreList":[]}

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

@@ -9,12 +9,31 @@ const TIMEOUT_MS = 30_000;
 /**
  * HTTP client for making browser API requests.
  * Mirrors Android's HttpClient.kt
- *
- * Config layering (the shared `request` → `<kind>` → route chain) is handled by
- * the callers via RequestConfigBuilder.applyLayer; this client just builds the
- * URL from the fully-merged config and executes the request.
+ * Uses RequestConfigBuilder for URL building and config merging.
  */
 export class HttpClient {
+  constructor(baseRequestConfig = {}) {
+    this.baseRequestConfig = baseRequestConfig;
+  }
+
+  /**
+   * Updates the base request configuration used for all requests.
+   */
+  setBaseRequestConfig(config) {
+    this.baseRequestConfig = config;
+  }
+
+  /**
+   * Merges multiple request configs with proper header and query parameter merging.
+   * Uses RequestConfigBuilder for consistent merging behavior.
+   */
+  mergeRequestConfig(base, overrides) {
+    // First merge base with the instance's base config
+    const withBase = RequestConfigBuilder.mergeConfig(this.baseRequestConfig, base);
+    // Then merge with overrides
+    return RequestConfigBuilder.mergeConfig(withBase, overrides);
+  }
+
   /**
    * Executes an HTTP request and returns the JSON response.
    * Throws navigation errors for HTTP and network failures.

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

@@ -1 +1 @@
-{"version":3,"names":["RequestConfigBuilder","isHttpError","error","Error","status","statusText","TIMEOUT_MS","HttpClient","executeRequest","config","url","buildUrl","headers","method","controller","AbortController","timeoutId","setTimeout","abort","response","fetch","signal","ok","json","DOMException","name","navError","code","message","statusCode","console","clearTimeout"],"sourceRoot":"../../../../src","sources":["web/http/HttpClient.ts"],"mappings":";;AAEA,SAASA,oBAAoB,QAAQ,wBAAwB;AAQ7D,SAASC,WAAWA,CAACC,KAAc,EAAsB;EACvD,OACEA,KAAK,YAAYC,KAAK,IACtB,aAAa,IAAID,KAAK,IACrBA,KAAK,CAAeD,WAAW,KAAK,IAAI,IACzC,OAAQC,KAAK,CAAeE,MAAM,KAAK,QAAQ,IAC/C,OAAQF,KAAK,CAAeG,UAAU,KAAK,QAAQ;AAEvD;AAEA,MAAMC,UAAU,GAAG,MAAM;;AAEzB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,CAAC;EACtB;AACF;AACA;AACA;EACE,MAAMC,cAAcA,CAACC,MAAqB,EAAoB;IAC5D;IACA,MAAMC,GAAG,GAAGV,oBAAoB,CAACW,QAAQ,CAACF,MAAM,CAAC;IACjD,MAAMG,OAAO,GAAGH,MAAM,CAACG,OAAO,IAAI,CAAC,CAAC;IACpC,MAAMC,MAAM,GAAGJ,MAAM,CAACI,MAAM,IAAI,KAAK;IAErC,MAAMC,UAAU,GAAG,IAAIC,eAAe,CAAC,CAAC;IACxC,MAAMC,SAAS,GAAGC,UAAU,CAAC,MAAMH,UAAU,CAACI,KAAK,CAAC,CAAC,EAAEZ,UAAU,CAAC;IAElE,IAAI;MACF,MAAMa,QAAQ,GAAG,MAAMC,KAAK,CAACV,GAAG,EAAE;QAChCG,MAAM;QACND,OAAO;QACPS,MAAM,EAAEP,UAAU,CAACO;MACrB,CAAC,CAAC;MAEF,IAAI,CAACF,QAAQ,CAACG,EAAE,EAAE;QAChB,MAAMpB,KAAK,GAAG,IAAIC,KAAK,CACrB,QAAQgB,QAAQ,CAACf,MAAM,KAAKe,QAAQ,CAACd,UAAU,EACjD,CAAc;QACdH,KAAK,CAACD,WAAW,GAAG,IAAI;QACxBC,KAAK,CAACE,MAAM,GAAGe,QAAQ,CAACf,MAAM;QAC9BF,KAAK,CAACG,UAAU,GAAGc,QAAQ,CAACd,UAAU;QACtC,MAAMH,KAAK;MACb;;MAEA;MACA,OAAO,MAAMiB,QAAQ,CAACI,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,OAAOrB,KAAc,EAAE;MACvB,IAAIA,KAAK,YAAYsB,YAAY,IAAItB,KAAK,CAACuB,IAAI,KAAK,YAAY,EAAE;QAChE,MAAMC,QAAQ,GAAG,IAAIvB,KAAK,CACxB,2BAA2BG,UAAU,IACvC,CAA0C;QAC1CoB,QAAQ,CAACC,IAAI,GAAG,eAAe;QAC/B,MAAMD,QAAQ;MAChB;MACA;MACA,IAAIzB,WAAW,CAACC,KAAK,CAAC,EAAE;QACtB,MAAMwB,QAAQ,GAAG,IAAIvB,KAAK,CAACD,KAAK,CAAC0B,OAAO,CAGvC;QACDF,QAAQ,CAACC,IAAI,GAAG,YAAY;QAC5BD,QAAQ,CAACG,UAAU,GAAG3B,KAAK,CAACE,MAAM;QAClC,MAAMsB,QAAQ;MAChB;;MAEA;MACA,MAAME,OAAO,GAAG1B,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAAC0B,OAAO,GAAG,iBAAiB;MAC1EE,OAAO,CAAC5B,KAAK,CAAC,0BAA0BQ,GAAG,GAAG,EAAER,KAAK,CAAC;MACtD,MAAMwB,QAAQ,GAAG,IAAIvB,KAAK,CAACyB,OAAO,CAEjC;MACDF,QAAQ,CAACC,IAAI,GAAG,eAAe;MAC/B,MAAMD,QAAQ;IAChB,CAAC,SAAS;MACRK,YAAY,CAACf,SAAS,CAAC;IACzB;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["RequestConfigBuilder","isHttpError","error","Error","status","statusText","TIMEOUT_MS","HttpClient","constructor","baseRequestConfig","setBaseRequestConfig","config","mergeRequestConfig","base","overrides","withBase","mergeConfig","executeRequest","url","buildUrl","headers","method","controller","AbortController","timeoutId","setTimeout","abort","response","fetch","signal","ok","json","DOMException","name","navError","code","message","statusCode","console","clearTimeout"],"sourceRoot":"../../../../src","sources":["web/http/HttpClient.ts"],"mappings":";;AAEA,SAASA,oBAAoB,QAAQ,wBAAwB;AAQ7D,SAASC,WAAWA,CAACC,KAAc,EAAsB;EACvD,OACEA,KAAK,YAAYC,KAAK,IACtB,aAAa,IAAID,KAAK,IACrBA,KAAK,CAAeD,WAAW,KAAK,IAAI,IACzC,OAAQC,KAAK,CAAeE,MAAM,KAAK,QAAQ,IAC/C,OAAQF,KAAK,CAAeG,UAAU,KAAK,QAAQ;AAEvD;AAEA,MAAMC,UAAU,GAAG,MAAM;;AAEzB;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,UAAU,CAAC;EAGtBC,WAAWA,CAACC,iBAAsD,GAAG,CAAC,CAAC,EAAE;IACvE,IAAI,CAACA,iBAAiB,GAAGA,iBAAiB;EAC5C;;EAEA;AACF;AACA;EACEC,oBAAoBA,CAACC,MAA2C,EAAQ;IACtE,IAAI,CAACF,iBAAiB,GAAGE,MAAM;EACjC;;EAEA;AACF;AACA;AACA;EACEC,kBAAkBA,CAChBC,IAAyC,EACzCC,SAAiC,EAClB;IACf;IACA,MAAMC,QAAQ,GAAGf,oBAAoB,CAACgB,WAAW,CAC/C,IAAI,CAACP,iBAAiB,EACtBI,IACF,CAAC;IACD;IACA,OAAOb,oBAAoB,CAACgB,WAAW,CACrCD,QAAQ,EACRD,SACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;EACE,MAAMG,cAAcA,CAACN,MAAqB,EAAoB;IAC5D;IACA,MAAMO,GAAG,GAAGlB,oBAAoB,CAACmB,QAAQ,CAACR,MAAM,CAAC;IACjD,MAAMS,OAAO,GAAGT,MAAM,CAACS,OAAO,IAAI,CAAC,CAAC;IACpC,MAAMC,MAAM,GAAGV,MAAM,CAACU,MAAM,IAAI,KAAK;IAErC,MAAMC,UAAU,GAAG,IAAIC,eAAe,CAAC,CAAC;IACxC,MAAMC,SAAS,GAAGC,UAAU,CAAC,MAAMH,UAAU,CAACI,KAAK,CAAC,CAAC,EAAEpB,UAAU,CAAC;IAElE,IAAI;MACF,MAAMqB,QAAQ,GAAG,MAAMC,KAAK,CAACV,GAAG,EAAE;QAChCG,MAAM;QACND,OAAO;QACPS,MAAM,EAAEP,UAAU,CAACO;MACrB,CAAC,CAAC;MAEF,IAAI,CAACF,QAAQ,CAACG,EAAE,EAAE;QAChB,MAAM5B,KAAK,GAAG,IAAIC,KAAK,CACrB,QAAQwB,QAAQ,CAACvB,MAAM,KAAKuB,QAAQ,CAACtB,UAAU,EACjD,CAAc;QACdH,KAAK,CAACD,WAAW,GAAG,IAAI;QACxBC,KAAK,CAACE,MAAM,GAAGuB,QAAQ,CAACvB,MAAM;QAC9BF,KAAK,CAACG,UAAU,GAAGsB,QAAQ,CAACtB,UAAU;QACtC,MAAMH,KAAK;MACb;;MAEA;MACA,OAAO,MAAMyB,QAAQ,CAACI,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,OAAO7B,KAAc,EAAE;MACvB,IAAIA,KAAK,YAAY8B,YAAY,IAAI9B,KAAK,CAAC+B,IAAI,KAAK,YAAY,EAAE;QAChE,MAAMC,QAAQ,GAAG,IAAI/B,KAAK,CACxB,2BAA2BG,UAAU,IACvC,CAA0C;QAC1C4B,QAAQ,CAACC,IAAI,GAAG,eAAe;QAC/B,MAAMD,QAAQ;MAChB;MACA;MACA,IAAIjC,WAAW,CAACC,KAAK,CAAC,EAAE;QACtB,MAAMgC,QAAQ,GAAG,IAAI/B,KAAK,CAACD,KAAK,CAACkC,OAAO,CAGvC;QACDF,QAAQ,CAACC,IAAI,GAAG,YAAY;QAC5BD,QAAQ,CAACG,UAAU,GAAGnC,KAAK,CAACE,MAAM;QAClC,MAAM8B,QAAQ;MAChB;;MAEA;MACA,MAAME,OAAO,GAAGlC,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACkC,OAAO,GAAG,iBAAiB;MAC1EE,OAAO,CAACpC,KAAK,CAAC,0BAA0BgB,GAAG,GAAG,EAAEhB,KAAK,CAAC;MACtD,MAAMgC,QAAQ,GAAG,IAAI/B,KAAK,CAACiC,OAAO,CAEjC;MACDF,QAAQ,CAACC,IAAI,GAAG,eAAe;MAC/B,MAAMD,QAAQ;IAChB,CAAC,SAAS;MACRK,YAAY,CAACf,SAAS,CAAC;IACzB;EACF;AACF","ignoreList":[]}