diff --git a/server/routes/dashboard.js b/server/routes/dashboard.js index 03c1651..d537adc 100644 --- a/server/routes/dashboard.js +++ b/server/routes/dashboard.js @@ -140,17 +140,13 @@ router.get('/user-downloads', async (req, res) => { // Read all data from cache const sabQueueData = cache.get('poll:sab-queue') || { slots: [] }; const sabHistoryData = cache.get('poll:sab-history') || { slots: [] }; + const sonarrTagsResults = cache.get('poll:sonarr-tags') || []; const sonarrQueueData = cache.get('poll:sonarr-queue') || { records: [] }; const sonarrHistoryData = cache.get('poll:sonarr-history') || { records: [] }; const radarrQueueData = cache.get('poll:radarr-queue') || { records: [] }; const radarrHistoryData = cache.get('poll:radarr-history') || { records: [] }; - const qbittorrentTorrents = cache.get('poll:qbittorrent') || []; - - // Slow-cached data (series/movie libraries + tags, refreshed every 5 min) - const sonarrSeriesData = cache.get('poll:sonarr-series') || []; - const radarrMoviesData = cache.get('poll:radarr-movies') || []; - const sonarrTagsResults = cache.get('poll:sonarr-tags') || []; const radarrTagsData = cache.get('poll:radarr-tags') || []; + const qbittorrentTorrents = cache.get('poll:qbittorrent') || []; // Wrap in the structure the rest of the code expects const sabnzbdQueue = { data: { queue: sabQueueData } }; @@ -161,9 +157,23 @@ router.get('/user-downloads', async (req, res) => { const radarrHistory = { data: radarrHistoryData }; const radarrTags = { data: radarrTagsData }; - // Build series/movie maps from the slow-cached full library - const seriesMap = new Map(sonarrSeriesData.map(s => [s.id, s])); - const moviesMap = new Map(radarrMoviesData.map(m => [m.id, m])); + // Build series/movie maps from embedded objects in queue records + // (history is fetched without includeSeries/includeMovie for speed; + // history matches fall back to the queue-built map via seriesId/movieId) + const seriesMap = new Map(); + for (const r of sonarrQueue.data.records) { + if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series); + } + for (const r of sonarrHistory.data.records) { + if (r.series && r.seriesId && !seriesMap.has(r.seriesId)) seriesMap.set(r.seriesId, r.series); + } + const moviesMap = new Map(); + for (const r of radarrQueue.data.records) { + if (r.movie && r.movieId) moviesMap.set(r.movieId, r.movie); + } + for (const r of radarrHistory.data.records) { + if (r.movie && r.movieId && !moviesMap.has(r.movieId)) moviesMap.set(r.movieId, r.movie); + } // Create tag maps (id -> label) const sonarrTagMap = new Map(sonarrTagsResults.flatMap(t => t.data || []).map(t => [t.id, t.label])); diff --git a/server/utils/poller.js b/server/utils/poller.js index f187fe4..4f3cac0 100644 --- a/server/utils/poller.js +++ b/server/utils/poller.js @@ -15,7 +15,6 @@ const POLLING_ENABLED = POLL_INTERVAL > 0; let polling = false; let lastPollTimings = null; -const SLOW_CACHE_TTL = 5 * 60 * 1000; // 5 minutes for series/movie library // Timed fetch helper: runs a fetch and records how long it took async function timed(label, fn) { @@ -37,59 +36,8 @@ async function pollAllServices() { const sonarrInstances = getSonarrInstances(); const radarrInstances = getRadarrInstances(); - // Slow-changing data: series/movie libraries + tags (only fetch when cache expired) - const slowTasks = []; - if (!cache.get('poll:sonarr-series')) { - slowTasks.push( - timed('Sonarr Series', () => Promise.all(sonarrInstances.map(inst => - axios.get(`${inst.url}/api/v3/series`, { - headers: { 'X-Api-Key': inst.apiKey } - }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { - console.error(`[Poller] Sonarr ${inst.id} series error:`, err.message); - return { instance: inst.id, data: [] }; - }) - ))) - ); - } - if (!cache.get('poll:radarr-movies')) { - slowTasks.push( - timed('Radarr Movies', () => Promise.all(radarrInstances.map(inst => - axios.get(`${inst.url}/api/v3/movie`, { - headers: { 'X-Api-Key': inst.apiKey } - }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { - console.error(`[Poller] Radarr ${inst.id} movies error:`, err.message); - return { instance: inst.id, data: [] }; - }) - ))) - ); - } - if (!cache.get('poll:sonarr-tags')) { - slowTasks.push( - timed('Sonarr Tags', () => Promise.all(sonarrInstances.map(inst => - axios.get(`${inst.url}/api/v3/tag`, { - headers: { 'X-Api-Key': inst.apiKey } - }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { - console.error(`[Poller] Sonarr ${inst.id} tags error:`, err.message); - return { instance: inst.id, data: [] }; - }) - ))) - ); - } - if (!cache.get('poll:radarr-tags')) { - slowTasks.push( - timed('Radarr Tags', () => Promise.all(radarrInstances.map(inst => - axios.get(`${inst.url}/api/v3/tag`, { - headers: { 'X-Api-Key': inst.apiKey } - }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { - console.error(`[Poller] Radarr ${inst.id} tags error:`, err.message); - return { instance: inst.id, data: [] }; - }) - ))) - ); - } - - // Fast-changing data: queues, history, torrents (every poll) - const fastTasks = [ + // All fetches in parallel, each individually timed + const results = await Promise.all([ timed('SABnzbd Queue', () => Promise.all(sabInstances.map(inst => axios.get(`${inst.url}/api`, { params: { mode: 'queue', apikey: inst.apiKey, output: 'json' } @@ -106,9 +54,18 @@ async function pollAllServices() { return { instance: inst.id, data: { history: { slots: [] } } }; }) ))), + timed('Sonarr Tags', () => Promise.all(sonarrInstances.map(inst => + axios.get(`${inst.url}/api/v3/tag`, { + headers: { 'X-Api-Key': inst.apiKey } + }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { + console.error(`[Poller] Sonarr ${inst.id} tags error:`, err.message); + return { instance: inst.id, data: [] }; + }) + ))), timed('Sonarr Queue', () => Promise.all(sonarrInstances.map(inst => axios.get(`${inst.url}/api/v3/queue`, { - headers: { 'X-Api-Key': inst.apiKey } + headers: { 'X-Api-Key': inst.apiKey }, + params: { includeSeries: true } }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { console.error(`[Poller] Sonarr ${inst.id} queue error:`, err.message); return { instance: inst.id, data: { records: [] } }; @@ -125,7 +82,8 @@ async function pollAllServices() { ))), timed('Radarr Queue', () => Promise.all(radarrInstances.map(inst => axios.get(`${inst.url}/api/v3/queue`, { - headers: { 'X-Api-Key': inst.apiKey } + headers: { 'X-Api-Key': inst.apiKey }, + params: { includeMovie: true } }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { console.error(`[Poller] Radarr ${inst.id} queue error:`, err.message); return { instance: inst.id, data: { records: [] } }; @@ -140,55 +98,41 @@ async function pollAllServices() { return { instance: inst.id, data: { records: [] } }; }) ))), + timed('Radarr Tags', () => Promise.all(radarrInstances.map(inst => + axios.get(`${inst.url}/api/v3/tag`, { + headers: { 'X-Api-Key': inst.apiKey } + }).then(res => ({ instance: inst.id, data: res.data })).catch(err => { + console.error(`[Poller] Radarr ${inst.id} tags error:`, err.message); + return { instance: inst.id, data: [] }; + }) + ))), timed('qBittorrent', () => getTorrents().catch(err => { console.error(`[Poller] qBittorrent error:`, err.message); return []; })) - ]; - - // Run slow + fast in parallel - const allResults = await Promise.all([...slowTasks, ...fastTasks]); - const slowResults = allResults.slice(0, slowTasks.length); - const fastResults = allResults.slice(slowTasks.length); + ]); const [ { result: sabQueues }, { result: sabHistories }, - { result: sonarrQueues }, { result: sonarrHistories }, + { result: sonarrTagsResults }, { result: sonarrQueues }, + { result: sonarrHistories }, { result: radarrQueues }, { result: radarrHistories }, + { result: radarrTagsResults }, { result: qbittorrentTorrents } - ] = fastResults; + ] = results; // Store per-task timings const totalMs = Date.now() - start; lastPollTimings = { totalMs, timestamp: new Date().toISOString(), - tasks: allResults.map(r => ({ label: r.label, ms: r.ms })) + tasks: results.map(r => ({ label: r.label, ms: r.ms })) }; // When polling is active, TTL is 3x interval to avoid gaps between polls // When polling is disabled (on-demand), use 30s so data refreshes on next request after expiry const cacheTTL = POLLING_ENABLED ? POLL_INTERVAL * 3 : 30000; - // Store slow-changing data (only if fetched this cycle) - for (const sr of slowResults) { - if (sr.label === 'Sonarr Series') { - cache.set('poll:sonarr-series', sr.result.flatMap(s => { - const inst = sonarrInstances.find(i => i.id === s.instance); - return (s.data || []).map(item => ({ ...item, _instanceUrl: inst ? inst.url : null })); - }), SLOW_CACHE_TTL); - } else if (sr.label === 'Radarr Movies') { - cache.set('poll:radarr-movies', sr.result.flatMap(m => { - const inst = radarrInstances.find(i => i.id === m.instance); - return (m.data || []).map(item => ({ ...item, _instanceUrl: inst ? inst.url : null })); - }), SLOW_CACHE_TTL); - } else if (sr.label === 'Sonarr Tags') { - cache.set('poll:sonarr-tags', sr.result, SLOW_CACHE_TTL); - } else if (sr.label === 'Radarr Tags') { - cache.set('poll:radarr-tags', sr.result.flatMap(t => t.data || []), SLOW_CACHE_TTL); - } - } - // SABnzbd const firstSabQueue = sabQueues[0] && sabQueues[0].data && sabQueues[0].data.queue; cache.set('poll:sab-queue', { @@ -202,21 +146,38 @@ async function pollAllServices() { slots: sabHistories.flatMap(h => (h.data.history && h.data.history.slots) || []) }, cacheTTL); - // Sonarr (lightweight — no embedded series/movie objects) + // Sonarr + cache.set('poll:sonarr-tags', sonarrTagsResults, cacheTTL); + // Tag queue/history records with _instanceUrl so embedded series/movie objects can build links cache.set('poll:sonarr-queue', { - records: sonarrQueues.flatMap(q => q.data.records || []) + records: sonarrQueues.flatMap(q => { + const inst = sonarrInstances.find(i => i.id === q.instance); + const url = inst ? inst.url : null; + return (q.data.records || []).map(r => { + if (r.series) r.series._instanceUrl = url; + return r; + }); + }) }, cacheTTL); cache.set('poll:sonarr-history', { records: sonarrHistories.flatMap(h => h.data.records || []) }, cacheTTL); - // Radarr (lightweight — no embedded series/movie objects) + // Radarr cache.set('poll:radarr-queue', { - records: radarrQueues.flatMap(q => q.data.records || []) + records: radarrQueues.flatMap(q => { + const inst = radarrInstances.find(i => i.id === q.instance); + const url = inst ? inst.url : null; + return (q.data.records || []).map(r => { + if (r.movie) r.movie._instanceUrl = url; + return r; + }); + }) }, cacheTTL); cache.set('poll:radarr-history', { records: radarrHistories.flatMap(h => h.data.records || []) }, cacheTTL); + cache.set('poll:radarr-tags', radarrTagsResults.flatMap(t => t.data || []), cacheTTL); // qBittorrent cache.set('poll:qbittorrent', qbittorrentTorrents, cacheTTL);