@bragduck/cli 2.9.3 → 2.9.7

package/dist/bin/bragduck.js

@@ -3420,16 +3420,41 @@ var JiraService = class {
       "issuetype"
     ];
     const allIssues = [];
+    const seenIssueKeys = /* @__PURE__ */ new Set();
     let startAt = 0;
     const maxResults = 100;
+    const maxIterations = 1e3;
+    let iterations = 0;
     while (true) {
+      iterations++;
+      if (iterations > maxIterations) {
+        logger.warning(
+          `Reached maximum iteration limit (${maxIterations}). Stopping pagination to prevent infinite loop.`
+        );
+        break;
+      }
       const endpoint = `/rest/api/2/search?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
       try {
         const response = await this.request(endpoint);
-        allIssues.push(...response.issues);
+        if (response.issues.length === 0) {
+          logger.debug("No more results returned, stopping pagination");
+          break;
+        }
+        let newIssuesCount = 0;
+        for (const issue of response.issues) {
+          if (!seenIssueKeys.has(issue.key)) {
+            seenIssueKeys.add(issue.key);
+            allIssues.push(issue);
+            newIssuesCount++;
+          }
+        }
         logger.debug(
-          `Fetched ${response.issues.length} issues (total: ${allIssues.length} of ${response.total})${startAt + maxResults < response.total ? ", fetching next page..." : ""}`
+          `Fetched ${newIssuesCount} new issues (total: ${allIssues.length} of ${response.total})${startAt + maxResults < response.total ? ", fetching next page..." : ""}`
         );
+        if (newIssuesCount === 0) {
+          logger.debug("All results are duplicates, stopping pagination");
+          break;
+        }
         if (startAt + maxResults >= response.total) {
           break;
         }
@@ -3447,7 +3472,10 @@ var JiraService = class {
             break;
           }
           if (startAt === 0) {
-            throw error;
+            logger.warning(
+              "No accessible issues found. Some resources may be deleted, archived, or you may not have permission to view them."
+            );
+            return [];
           }
           startAt += maxResults;
           continue;
@@ -3696,9 +3724,19 @@ var ConfluenceService = class {
   async getPages(options = {}) {
     const cql = this.buildCQL(options);
     const allPages = [];
+    const seenPageIds = /* @__PURE__ */ new Set();
     let start = 0;
     const limit = 100;
+    const maxIterations = 1e3;
+    let iterations = 0;
     while (true) {
+      iterations++;
+      if (iterations > maxIterations) {
+        logger.warning(
+          `Reached maximum iteration limit (${maxIterations}). Stopping pagination to prevent infinite loop.`
+        );
+        break;
+      }
       const params = {
         type: "page",
         status: "current",
@@ -3711,18 +3749,54 @@ var ConfluenceService = class {
       }
       const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
       const endpoint = `/wiki/rest/api/content?${queryString}`;
-      const response = await this.request(endpoint);
-      allPages.push(...response.results);
-      logger.debug(
-        `Fetched ${response.results.length} pages (total: ${allPages.length})${response.results.length === limit ? ", fetching next page..." : ""}`
-      );
-      if (response.results.length < limit) {
-        break;
-      }
-      if (options.limit && allPages.length >= options.limit) {
-        return allPages.slice(0, options.limit).map((page) => this.transformPageToCommit(page));
+      try {
+        const response = await this.request(endpoint);
+        if (response.results.length === 0) {
+          logger.debug("No more results returned, stopping pagination");
+          break;
+        }
+        let newPagesCount = 0;
+        for (const page of response.results) {
+          if (!seenPageIds.has(page.id)) {
+            seenPageIds.add(page.id);
+            allPages.push(page);
+            newPagesCount++;
+          }
+        }
+        logger.debug(
+          `Fetched ${newPagesCount} new pages (total: ${allPages.length}, duplicates: ${response.results.length - newPagesCount})${response.size === limit ? ", fetching next page..." : ""}`
+        );
+        if (newPagesCount === 0) {
+          logger.debug("All results are duplicates, stopping pagination");
+          break;
+        }
+        if (response.size === 0 || response.size < limit) {
+          break;
+        }
+        if (options.limit && allPages.length >= options.limit) {
+          return allPages.slice(0, options.limit).map((page) => this.transformPageToCommit(page));
+        }
+        start += limit;
+      } catch (error) {
+        if (error instanceof ConfluenceError && error.message.includes("no longer available")) {
+          logger.warning(`Skipping unavailable Confluence resource: ${error.message}`);
+          if (allPages.length > 0) {
+            logger.info(
+              `Returning ${allPages.length} available pages (some resources were unavailable)`
+            );
+            break;
+          }
+          if (start === 0) {
+            logger.warning(
+              "No accessible pages found. Some resources may be deleted, archived, or you may not have permission to view them."
+            );
+            return [];
+          }
+          start += limit;
+          continue;
+        }
+        throw error;
       }
-      start += limit;
     }
     return allPages.map((page) => this.transformPageToCommit(page));
   }
@@ -4638,7 +4712,7 @@ async function syncAllAuthenticatedServices(options) {
     } catch (error) {
       const err = error;
       logger.log("");
-      logger.warn(`Failed to sync ${serviceLabel}: ${err.message}`);
+      logger.warning(`Failed to sync ${serviceLabel}: ${err.message}`);
       logger.log("");
       results.push({ service, created: 0, skipped: 0, error: err.message });
     }