@bragduck/cli 2.9.2 → 2.9.5

package/dist/bin/bragduck.js

@@ -3424,18 +3424,36 @@ var JiraService = class {
     const maxResults = 100;
     while (true) {
       const endpoint = `/rest/api/2/search?jql=${encodeURIComponent(jql)}&startAt=${startAt}&maxResults=${maxResults}&fields=${fields.join(",")}`;
-      const response = await this.request(endpoint);
-      allIssues.push(...response.issues);
-      logger.debug(
-        `Fetched ${response.issues.length} issues (total: ${allIssues.length} of ${response.total})${startAt + maxResults < response.total ? ", fetching next page..." : ""}`
-      );
-      if (startAt + maxResults >= response.total) {
-        break;
-      }
-      if (options.limit && allIssues.length >= options.limit) {
-        return allIssues.slice(0, options.limit).map((issue) => this.transformIssueToCommit(issue));
+      try {
+        const response = await this.request(endpoint);
+        allIssues.push(...response.issues);
+        logger.debug(
+          `Fetched ${response.issues.length} issues (total: ${allIssues.length} of ${response.total})${startAt + maxResults < response.total ? ", fetching next page..." : ""}`
+        );
+        if (startAt + maxResults >= response.total) {
+          break;
+        }
+        if (options.limit && allIssues.length >= options.limit) {
+          return allIssues.slice(0, options.limit).map((issue) => this.transformIssueToCommit(issue));
+        }
+        startAt += maxResults;
+      } catch (error) {
+        if (error instanceof JiraError && error.message.includes("no longer available")) {
+          logger.warning(`Skipping unavailable Jira resource: ${error.message}`);
+          if (allIssues.length > 0) {
+            logger.info(
+              `Returning ${allIssues.length} available issues (some resources were unavailable)`
+            );
+            break;
+          }
+          if (startAt === 0) {
+            throw error;
+          }
+          startAt += maxResults;
+          continue;
+        }
+        throw error;
       }
-      startAt += maxResults;
     }
     return allIssues.map((issue) => this.transformIssueToCommit(issue));
   }
@@ -3693,18 +3711,36 @@ 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);
+        allPages.push(...response.results);
+        logger.debug(
+          `Fetched ${response.size} pages (total: ${allPages.length})${response.size === limit ? ", fetching next page..." : ""}`
+        );
+        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) {
+            throw error;
+          }
+          start += limit;
+          continue;
+        }
+        throw error;
       }
-      start += limit;
     }
     return allPages.map((page) => this.transformPageToCommit(page));
   }
@@ -4620,7 +4656,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 });
     }