@pilatos/bitbucket-cli 1.9.1 → 1.10.1

package/dist/index.js

@@ -18187,6 +18187,24 @@ var axios_default = axios;
 
 // src/services/api-client.service.ts
 var BASE_URL = "https://api.bitbucket.org/2.0";
+var MAX_RETRIES = 3;
+var BASE_DELAY_MS = 1000;
+var RETRYABLE_STATUS_CODES = new Set([429, 502, 503, 504]);
+function getRetryDelay(error, attempt) {
+  if (error.response?.status === 429) {
+    const retryAfter = error.response.headers["retry-after"];
+    if (retryAfter) {
+      const seconds = Number.parseInt(retryAfter, 10);
+      if (!Number.isNaN(seconds)) {
+        return seconds * 1000;
+      }
+    }
+  }
+  return BASE_DELAY_MS * Math.pow(2, attempt - 1);
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function createApiClient(configService) {
   const instance = axios_default.create({
     baseURL: BASE_URL,
@@ -18210,13 +18228,28 @@ function createApiClient(configService) {
       console.debug(`[HTTP] Response Body:`, JSON.stringify(response.data, null, 2));
     }
     return response;
-  }, (error) => {
+  }, async (error) => {
     if (process.env.DEBUG === "true") {
       console.debug(`[HTTP] Error:`, error.message);
       if (error.response) {
         console.debug(`[HTTP] Error Response Body:`, JSON.stringify(error.response.data, null, 2));
       }
     }
+    if (error.response && RETRYABLE_STATUS_CODES.has(error.response.status)) {
+      const config = error.config;
+      if (config) {
+        const retryCount = config.__retryCount ?? 0;
+        if (retryCount < MAX_RETRIES) {
+          config.__retryCount = retryCount + 1;
+          const delay = getRetryDelay(error, config.__retryCount);
+          const status = error.response.status;
+          const label = status === 429 ? "Rate limited" : `Server error (${status})`;
+          console.error(`${label}, retrying in ${(delay / 1000).toFixed(1)}s (attempt ${config.__retryCount}/${MAX_RETRIES})...`);
+          await sleep(delay);
+          return instance(config);
+        }
+      }
+    }
     if (error.response) {
       const { status, data } = error.response;
       const message = extractErrorMessage(data) || error.message;
@@ -18252,6 +18285,45 @@ function extractErrorMessage(data) {
   }
   return;
 }
+// src/services/reviewer.service.ts
+function extractReviewerUuids(reviewers) {
+  if (!reviewers) {
+    return [];
+  }
+  const list = Array.from(reviewers);
+  const uuids = [];
+  for (const reviewer of list) {
+    if (reviewer.uuid) {
+      uuids.push(reviewer.uuid);
+    }
+  }
+  return uuids;
+}
+function buildReviewersUpdateBody(uuids) {
+  const body = {
+    type: "pullrequest",
+    reviewers: uuids.map((uuid) => ({ type: "user", uuid }))
+  };
+  return body;
+}
+async function updatePullRequestReviewers(pullrequestsApi, repoContext, prId, transformUuids) {
+  const prResponse = await pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
+    workspace: repoContext.workspace,
+    repoSlug: repoContext.repoSlug,
+    pullRequestId: prId
+  });
+  const pr = prResponse.data;
+  const currentUuids = extractReviewerUuids(pr.reviewers);
+  const updatedUuids = transformUuids(currentUuids);
+  const body = buildReviewersUpdateBody(updatedUuids);
+  const response = await pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
+    workspace: repoContext.workspace,
+    repoSlug: repoContext.repoSlug,
+    pullRequestId: prId,
+    body
+  });
+  return response.data;
+}
 // src/bootstrap.ts
 import { createRequire } from "module";
 
@@ -23164,25 +23236,11 @@ class AddReviewerPRCommand extends BaseCommand {
       selectedUser: options.username
     });
     const user = userResponse.data;
-    const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-      workspace: repoContext.workspace,
-      repoSlug: repoContext.repoSlug,
-      pullRequestId: prId
-    });
-    const pr = prResponse.data;
-    const existingReviewers = pr.reviewers ? Array.from(pr.reviewers) : [];
-    const reviewerUuids = existingReviewers.map((r) => r.uuid).filter(Boolean);
-    if (!reviewerUuids.includes(user.uuid)) {
-      reviewerUuids.push(user.uuid);
-    }
-    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
-      workspace: repoContext.workspace,
-      repoSlug: repoContext.repoSlug,
-      pullRequestId: prId,
-      body: {
-        type: "pullrequest",
-        reviewers: reviewerUuids.map((uuid) => ({ uuid }))
+    const updatedPr = await updatePullRequestReviewers(this.pullrequestsApi, repoContext, prId, (uuids) => {
+      if (!uuids.includes(user.uuid)) {
+        return [...uuids, user.uuid];
       }
+      return uuids;
     });
     if (context.globalOptions.json) {
       this.output.json({
@@ -23192,7 +23250,7 @@ class AddReviewerPRCommand extends BaseCommand {
           username: options.username,
           uuid: user.uuid
         },
-        pullRequest: response.data
+        pullRequest: updatedPr
       });
       return;
     }
@@ -23223,23 +23281,7 @@ class RemoveReviewerPRCommand extends BaseCommand {
       selectedUser: options.username
     });
     const user = userResponse.data;
-    const prResponse = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdGet({
-      workspace: repoContext.workspace,
-      repoSlug: repoContext.repoSlug,
-      pullRequestId: prId
-    });
-    const pr = prResponse.data;
-    const existingReviewers = pr.reviewers ? Array.from(pr.reviewers) : [];
-    const reviewerUuids = existingReviewers.map((r) => r.uuid).filter((uuid) => uuid && uuid !== user.uuid);
-    const response = await this.pullrequestsApi.repositoriesWorkspaceRepoSlugPullrequestsPullRequestIdPut({
-      workspace: repoContext.workspace,
-      repoSlug: repoContext.repoSlug,
-      pullRequestId: prId,
-      body: {
-        type: "pullrequest",
-        reviewers: reviewerUuids.map((uuid) => ({ uuid }))
-      }
-    });
+    const updatedPr = await updatePullRequestReviewers(this.pullrequestsApi, repoContext, prId, (uuids) => uuids.filter((uuid) => uuid !== user.uuid));
     if (context.globalOptions.json) {
       this.output.json({
         success: true,
@@ -23248,7 +23290,7 @@ class RemoveReviewerPRCommand extends BaseCommand {
           username: options.username,
           uuid: user.uuid
         },
-        pullRequest: response.data
+        pullRequest: updatedPr
       });
       return;
     }
@@ -23975,11 +24017,17 @@ function createContext(program2) {
   };
 }
 async function runCommand(token, options, program2, context) {
-  const cmd = container.resolve(token);
-  const resolvedContext = context ?? createContext(program2);
   try {
+    const cmd = container.resolve(token);
+    const resolvedContext = context ?? createContext(program2);
     return await cmd.run(options, resolvedContext);
-  } catch {
+  } catch (error) {
+    if (error instanceof Error && error.message.startsWith("Service not registered")) {
+      console.error(`Internal error: ${error.message}`);
+    }
+    if (!process.exitCode) {
+      process.exitCode = 1;
+    }
     return;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pilatos/bitbucket-cli",
-  "version": "1.9.1",
+  "version": "1.10.1",
   "description": "A command-line interface for Bitbucket Cloud",
   "author": "",
   "license": "MIT",