Fix episodes on the series page serving stale items

scripts/cardBuilder.js

@@ -1374,15 +1374,40 @@
         const resolveFreshItems = async () => {
             if (results.length > 1) {
                 const merged = ApiHelper.mergeMultiQueryResults(results, sectionConfig);
+                // Kick SWR so _refreshPromise is attached when cache is stale
                 const raw =
                     typeof merged.result?.ensureData === 'function'
                         ? await merged.result.ensureData()
                         : await (merged.result?.dataPromise ?? merged.result?.data);
+
+                const hasRefresh = results.some((r) => r && r._refreshPromise);
+                if (hasRefresh) {
+                    const allData = await Promise.all(
+                        results.map((r) => r._refreshPromise || Promise.resolve(r.data)),
+                    );
+                    const itemsByFreshQuery = [];
+                    allData.forEach((data) => {
+                        if (data?.Items) itemsByFreshQuery.push(data.Items);
+                        else if (Array.isArray(data)) itemsByFreshQuery.push(data);
+                    });
+                    return postProcessItemsByQuery(sectionConfig, itemsByFreshQuery);
+                }
+
                 return extractItemsFromQueryPayload(raw);
             }
             if (results.length === 1) {
                 const qr = results[0];
-                const raw = typeof qr.ensureData === 'function' ? await qr.ensureData() : await (qr.dataPromise ?? qr.data);
+                // Kick SWR so _refreshPromise is attached when cache is stale
+                const raw =
+                    typeof qr.ensureData === 'function'
+                        ? await qr.ensureData()
+                        : await (qr.dataPromise ?? qr.data);
+
+                if (qr._refreshPromise) {
+                    const fresh = await qr._refreshPromise;
+                    return postProcessItems(sectionConfig, extractItemsFromQueryPayload(fresh));
+                }
+
                 return postProcessItems(sectionConfig, extractItemsFromQueryPayload(raw));
             }
             return [];

scripts/seriesEpisodes.js

@@ -100,13 +100,6 @@
         };
     }
 
-    function postProcessEpisodes(data) {
-        const items = Array.isArray(data)
-            ? data.slice()
-            : (Array.isArray(data?.Items) ? data.Items.slice() : []);
-        return items.sort((a, b) => (a.IndexNumber || 0) - (b.IndexNumber || 0));
-    }
-
     function formatSeasonName(seasonNameValue, seasonNumber) {
         if (!seasonNameValue) {
             return `Season ${seasonNumber}`;
@@ -122,9 +115,8 @@
     }
 
     async function buildSeriesEpisodesSection(seriesId, seasons, initialSeason, onMultiQueryChange) {
-        const apiHelper = window.apiHelper;
-        if (!apiHelper?.getQuery || !apiHelper?.buildQueryFromSection) {
-            throw new Error('apiHelper.getQuery / buildQueryFromSection unavailable');
+        if (!window.sectionHelper?.loadSectionForRendering) {
+            throw new Error('sectionHelper.loadSectionForRendering unavailable');
         }
 
         const initialIndex = Math.max(0, seasons.findIndex((season) => seasonId(season) === seasonId(initialSeason)));
@@ -176,50 +168,11 @@
             sectionConfig._onMultiQueryChange = onMultiQueryChange;
         }
 
-        const initialQuery = queries[initialIndex];
-        const userId = ApiClient.getCurrentUserId();
-        const serverUrl = ApiClient.serverAddress();
-        const url = apiHelper.buildQueryFromSection(initialQuery, userId, serverUrl);
-        if (typeof url !== 'string') {
-            throw new Error(`Invalid episodes query URL for season ${seasonId(initialSeasonObj)}`);
+        const loaded = await window.sectionHelper.loadSectionForRendering(sectionConfig);
+        if (!loaded?.config || !loaded?.result) {
+            throw new Error(`Failed to load series-episodes section for ${seriesId}`);
         }
-
-        const queryResult = await apiHelper.getQuery(url, {
-            useCache: true,
-            ttl: EPISODES_CACHE_TTL
-        });
-
-        let mappedDataPromise = null;
-        const ensureData = () => {
-            if (!mappedDataPromise) {
-                const raw = typeof queryResult.ensureData === 'function'
-                    ? queryResult.ensureData()
-                    : queryResult.dataPromise;
-                mappedDataPromise = Promise.resolve(raw)
-                    .then((data) => postProcessEpisodes(data))
-                    .catch((err) => {
-                        WARN('episodes ensureData failed for season', seasonId(initialSeasonObj), err);
-                        return [];
-                    });
-            }
-            return mappedDataPromise;
-        };
-
-        const result = {
-            data: postProcessEpisodes(queryResult.data),
-            isStale: queryResult.isStale === true,
-            isStalePromise: queryResult.isStalePromise,
-            ensureData
-        };
-        Object.defineProperty(result, 'dataPromise', {
-            configurable: true,
-            enumerable: true,
-            get() {
-                return ensureData();
-            }
-        });
-
-        return { config: sectionConfig, result };
+        return loaded;
     }
 
     function getSectionTitleContainer(host) {