@cmflow/cli 3.0.1 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -31,6 +31,7 @@
   "dependencies": {
     "any-observable": "0.5.1",
     "axios": "1.8.2",
+    "axios-retry": "^4.5.0",
     "chalk": "^4.1.0",
     "commander": "5.1.0",
     "execa": "5.1.1",

package/src/common/back/directus/directus-flow.js

@@ -1,3 +1,5 @@
+import axiosRetry from "axios-retry";
+
 import { getConfig } from "../../get-config.js";
 import { httpRequest } from "../http/http-request.js";
 
@@ -25,6 +27,8 @@ export async function triggerDirectusFlow(projectId, versions, opts = {}) {
       projectId,
       versions
     },
+    retries: 3,
+    retryDelay: axiosRetry.exponentialDelay,
     ...opts
   };
 

package/src/common/back/http/http-request.js

@@ -1,19 +1,24 @@
-import fetch from "node-fetch";
+import axios from "axios";
+import axiosRetry from "axios-retry";
 
 import { getHttpProxy } from "./http-proxy.js";
 
-// export type HttpRequestOptions = {
-//   rejectUnauthorized?: boolean;
-//   callee?: string;
-//   params?: Record<string, string>;
-// } & fetch.RequestInit;
 /**
- * @typedef {Object & RequestInit} HttpRequestOptions
+ * @typedef {Object} RetryOptions
+ * @property {number} [retries=3] - Number of retry attempts
+ * @property {number} [retryDelay=1000] - Delay between retries in ms
+ * @property {boolean} [retryOnNetworkError=true] - Retry on network errors
+ * @property {boolean} [retryOnIdempotentRequests=true] - Retry on 5xx for idempotent requests
+ */
+
+/**
+ * @typedef {Object} HttpRequestOptions
  * @property {boolean} [rejectUnauthorized] - Whether to reject unauthorized SSL certificates
  * @property {string} [callee] - The name of the caller
  * @property {Record<string, string>} [params] - Query parameters to be included in the request
  * @property {string} [method] - HTTP method (default: 'get')
  * @property {Record<string, string>} [headers] - Custom headers to be included in the request
+ * @property {RetryOptions|boolean} [retry] - Retry configuration (true for defaults, or custom config)
  */
 
 /**
@@ -23,43 +28,50 @@ import { getHttpProxy } from "./http-proxy.js";
  * @return {Promise<*>}
  */
 export async function httpRequest(endpoint, options = {}) {
-  const { callee, headers, method = "get", params = {}, rejectUnauthorized } = options;
-  const agent = getHttpProxy({
+  const { callee, headers, method = "get", params = {}, rejectUnauthorized, ...rest } = options;
+  const httpsAgent = getHttpProxy({
     rejectUnauthorized,
     callee
   });
 
-  const queryParams = new URLSearchParams(params);
-  const url = `${endpoint}${queryParams.size ? "?" + queryParams : ""}`;
+  const instance = axios.create();
 
-  const response = await fetch(url, {
-    method,
-    headers: {
-      ...headers,
-      "Content-Type": "application/json"
-    },
-    agent,
-    ...options
-  });
+  axiosRetry(instance, options);
+
+  try {
+    const response = await instance({
+      url: endpoint,
+      method,
+      params,
+      headers: {
+        ...headers,
+        "Content-Type": "application/json"
+      },
+      httpsAgent,
+      ...rest
+    });
+
+    console.info({
+      message: `Successfully retrieved data from ${callee}`,
+      url: endpoint,
+      method: method.toUpperCase(),
+      status: response.status
+    });
+
+    return response.data;
+  } catch (error) {
+    const status = error.response?.status;
+    const responseData = error.response?.data;
 
-  if (!response.ok) {
     console.error({
       ...options,
       message: `Fail to retrieved data from ${callee}`,
-      url,
+      url: endpoint,
       method: method.toUpperCase(),
-      status: response.status,
-      response: await response.json()
+      status,
+      response: responseData
     });
-    throw new Error(`HTTP error! status: ${response.status}`);
-  }
 
-  console.info({
-    message: `Successfully retrieved data from ${callee}`,
-    url,
-    method: method.toUpperCase(),
-    status: response.status
-  });
-
-  return response.json();
+    throw new Error(`HTTP error! status: ${status}`);
+  }
 }

package/src/common/back/http/http-request.spec.js

@@ -1,24 +1,26 @@
-import fetch from "node-fetch";
+import axios from "axios";
+import axiosRetry from "axios-retry";
 
 import { getHttpProxy } from "./http-proxy.js";
 import { httpRequest } from "./http-request.js";
 
-vi.mock("node-fetch");
+vi.mock("axios");
+vi.mock("axios-retry");
 vi.mock("./http-proxy.js");
 
 describe("httpRequest", () => {
+  let mockInstance;
+
   beforeEach(() => {
     vi.clearAllMocks();
+    mockInstance = vi.fn();
+    vi.mocked(axios.create).mockReturnValue(mockInstance);
   });
 
   it("should create an agent in production with proxy", async () => {
-    vi.mocked(fetch).mockResolvedValue({
+    mockInstance.mockResolvedValue({
       status: 200,
-      headers: { "content-type": "application/json" },
-      ok: true,
-      async json() {
-        return { data: "test" };
-      }
+      data: { data: "test" }
     });
 
     const result = await httpRequest("http://example.com/test-endpoint", {
@@ -29,18 +31,18 @@ describe("httpRequest", () => {
       rejectUnauthorized: undefined,
       callee: "test"
     });
+    expect(axios.create).toHaveBeenCalled();
+    expect(axiosRetry).toHaveBeenCalled();
     expect(result).toEqual({ data: "test" });
   });
 
   it("should throw an error if the response is not ok", async () => {
-    vi.mocked(fetch).mockResolvedValue({
+    const axiosError = new Error("Request failed");
+    axiosError.response = {
       status: 500,
-      headers: { "content-type": "application/json" },
-      ok: false,
-      async json() {
-        return { data: "test" };
-      }
-    });
+      data: { error: "Internal server error" }
+    };
+    mockInstance.mockRejectedValue(axiosError);
 
     await expect(httpRequest("http://example.com/test-endpoint", { callee: "test" })).rejects.toThrow("HTTP error! status: 500");
   });

package/src/common/back/jira/jira-request.js

@@ -1,3 +1,5 @@
+import axiosRetry from "axios-retry";
+
 import { getConfig } from "../../get-config.js";
 import { httpRequest } from "../http/http-request.js";
 
@@ -16,6 +18,8 @@ export async function jiraRequest(endpoint, opts = {}) {
     headers: {
       ...opts.headers,
       Authorization: `Basic ${auth}`
-    }
+    },
+    retries: 3,
+    retryDelay: axiosRetry.exponentialDelay
   });
 }

package/src/common/back/jira/jira-request.spec.js

@@ -2,6 +2,7 @@ import { httpRequest } from "../http/http-request.js";
 import { jiraRequest } from "./jira-request.js";
 
 vi.mock("../http/http-request.js");
+vi.mock("axios-retry");
 
 describe("jiraRequest", () => {
   beforeEach(() => {
@@ -34,14 +35,19 @@ describe("jiraRequest", () => {
       params: { key: "value" }
     });
 
-    expect(httpRequest).toHaveBeenCalledWith(expect.stringContaining("/test-endpoint"), {
-      callee: "JIRA",
-      method: "post",
-      params: { key: "value" },
-      headers: expect.objectContaining({
-        Authorization: expect.stringContaining("Basic ")
+    expect(httpRequest).toHaveBeenCalledWith(
+      expect.stringContaining("/test-endpoint"),
+      expect.objectContaining({
+        callee: "JIRA",
+        method: "post",
+        params: { key: "value" },
+        headers: expect.objectContaining({
+          Authorization: expect.stringContaining("Basic ")
+        }),
+        retries: 3,
+        retryDelay: expect.any(Function)
       })
-    });
+    );
     expect(result).toEqual(mockResponse);
   });
 

package/src/common/back/jira/jira-search.spec.js

@@ -2,6 +2,7 @@ import { jiraRequest } from "./jira-request.js";
 import { jiraSearch } from "./jira-search.js";
 
 vi.mock("./jira-request.js");
+vi.mock("axios-retry");
 
 describe("jiraSearch", () => {
   beforeEach(() => {

package/src/common/get-config.js

@@ -87,6 +87,7 @@ export function getConfig() {
     GIT_USER_EMAIL,
     GITLAB_USER_EMAIL,
     GITLAB_USER_NAME,
+    GIT_FETCH_MAX_DEPTH,
     JIRA_API,
     JIRA_EMAIL,
     JIRA_TOKEN,
@@ -137,6 +138,7 @@ export function getConfig() {
     REPOSITORY_URL: get(pkg, "repository.url", get(pkg, "repository", REPOSITORY_URL)),
     GIT_USER_NAME: GIT_USER_NAME || GITLAB_USER_NAME,
     GIT_USER_EMAIL: GIT_USER_EMAIL || GITLAB_USER_EMAIL,
+    GIT_FETCH_MAX_DEPTH,
     GIT_DISABLE_SSL,
     BUMP_METHOD,
     JIRA_API,

package/src/semantic/core/verify-conditions.js

@@ -10,7 +10,7 @@ export function verifyConditions(pluginConfig, context) {
   context.config = getConfig();
   const {
     branch,
-    config: { USER, EMAIL, ORIGIN }
+    config: { USER, EMAIL, ORIGIN, GIT_FETCH_MAX_DEPTH }
   } = context;
 
   if (USER && EMAIL) {
@@ -26,7 +26,8 @@ export function verifyConditions(pluginConfig, context) {
     process.exit(1);
   }
 
-  git.fetch().sync();
+  GIT_FETCH_MAX_DEPTH ? git.fetch(`--depth=${GIT_FETCH_MAX_DEPTH}`).sync() : git.fetch().sync();
+
   git.checkout(branch.name).sync();
   git.branch(`--set-upstream-to=${ORIGIN}/${branch.name}`, branch.name).sync();
 }