Merge pull request 'fix: full pagination + non-silent errors in PollingSonarrRetriever' (#26) from fix-sonarr-retriever into develop-merge

Reviewed-on: #26

server/clients/PollingSonarrRetriever.js

@@ -37,17 +37,35 @@ class PollingSonarrRetriever extends ArrRetriever {
    * @returns {Promise<Object>} Queue object with records array
    */
   async getQueue() {
-    try {
-      // Fetch with large page size to get all items (Sonarr has pagination)
-      const response = await axios.get(`${this.url}/api/v3/queue`, {
-        headers: { 'X-Api-Key': this.apiKey },
-        params: { includeSeries: true, includeEpisode: true, pageSize: 1000 }
-      });
-      return response.data;
-    } catch (error) {
-      logToFile(`[PollingSonarrRetriever] ${this.id} queue error: ${error.message}`);
-      return { records: [] };
-    }
+    const instanceName = this.name;
+    let page = 1;
+    let allRecords = [];
+    let responseData = null;
+
+    do {
+      try {
+        const response = await axios.get(`${this.url}/api/v3/queue`, {
+          headers: { 'X-Api-Key': this.apiKey },
+          params: { includeSeries: true, includeEpisode: true, page, pageSize: 1000 }
+        });
+        responseData = response.data;
+      } catch (error) {
+        console.error(`Sonarr queue fetch failed for instance ${instanceName}:`, error.response?.data || error.message);
+        throw error;
+      }
+
+      const records = responseData.records || (Array.isArray(responseData) ? responseData : []);
+      allRecords = allRecords.concat(records);
+      page++;
+    } while (
+      (responseData.records || (Array.isArray(responseData) ? responseData : [])).length === 1000 &&
+      page <= 50
+    );
+
+    return {
+      ...responseData,
+      records: allRecords
+    };
   }
 
   /**
@@ -71,8 +89,14 @@ class PollingSonarrRetriever extends ArrRetriever {
       startDate
     } = options;
 
-    try {
+    const instanceName = this.name;
+    let page = 1;
+    let allRecords = [];
+    let responseData = null;
+
+    do {
       const params = {
+        page,
         pageSize,
         includeSeries,
         includeEpisode
@@ -82,15 +106,29 @@ class PollingSonarrRetriever extends ArrRetriever {
       if (sortDir) params.sortDir = sortDir;
       if (startDate) params.startDate = startDate;
 
-      const response = await axios.get(`${this.url}/api/v3/history`, {
-        headers: { 'X-Api-Key': this.apiKey },
-        params
-      });
-      return response.data;
-    } catch (error) {
-      logToFile(`[PollingSonarrRetriever] ${this.id} history error: ${error.message}`);
-      return { records: [] };
-    }
+      try {
+        const response = await axios.get(`${this.url}/api/v3/history`, {
+          headers: { 'X-Api-Key': this.apiKey },
+          params
+        });
+        responseData = response.data;
+      } catch (error) {
+        console.error(`Sonarr history fetch failed for instance ${instanceName}:`, error.response?.data || error.message);
+        throw error;
+      }
+
+      const records = responseData.records || (Array.isArray(responseData) ? responseData : []);
+      allRecords = allRecords.concat(records);
+      page++;
+    } while (
+      (responseData.records || (Array.isArray(responseData) ? responseData : [])).length === pageSize &&
+      page <= 50
+    );
+
+    return {
+      ...responseData,
+      records: allRecords
+    };
   }
 }