From ff7b50ff55933cd1193b6fd7896d8b9a080a036f Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Wed, 16 Apr 2025 11:02:59 +0530 Subject: [PATCH 1/2] Handling rate limit exceeded error --- .../contentstack-branches/src/utils/index.ts | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/contentstack-branches/src/utils/index.ts b/packages/contentstack-branches/src/utils/index.ts index da9a10cfdb..64645a298a 100644 --- a/packages/contentstack-branches/src/utils/index.ts +++ b/packages/contentstack-branches/src/utils/index.ts @@ -3,7 +3,7 @@ */ import fs from 'fs'; import path from 'path'; -import forEach from 'lodash/forEach' +import forEach from 'lodash/forEach'; import { configHandler, cliux, messageHandler, sanitizePath } from '@contentstack/cli-utilities'; import { MergeParams } from '../interfaces'; @@ -73,7 +73,7 @@ export async function getMergeQueueStatus(stackAPIClient, payload): Promise .mergeQueue(mergeJobUID) .fetch() .then((data) => data) - .catch((err) => handleErrorMsg(err)); + .catch((err) => handleErrorMsg(err, () => getMergeQueueStatus(stackAPIClient, payload))); } export async function executeMergeRequest(stackAPIClient, payload): Promise { @@ -95,10 +95,18 @@ export async function executeMergeRequest(stackAPIClient, payload): Promise .branch() .merge(itemMergeStrategies, queryParams) .then((data) => data) - .catch((err) => handleErrorMsg(err)); + .catch((err) => handleErrorMsg(err, () => executeMergeRequest(stackAPIClient, payload))); } -export function handleErrorMsg(err) { +export async function handleErrorMsg(err, retryCallback?: () => Promise) { + // Handle rate limit exceeded (status code 429) + if (err?.status === 429 || err?.response?.status === 429) { + await new Promise((resolve) => setTimeout(resolve, 1000)); // 1 sec delay + if (retryCallback) { + return retryCallback(); // Retry the request + } + } + if (err?.errorMessage) { cliux.print(`Error: ${err.errorMessage}`, { color: 'red' }); } else if (err?.message) { @@ -116,7 +124,7 @@ export function validateCompareData(branchCompareData) { forEach(branchCompareData.content_types, (value, key) => { if (value?.length > 0) { validCompareData = true; - } + } }); } @@ -124,7 +132,7 @@ export function validateCompareData(branchCompareData) { forEach(branchCompareData.global_fields, (value, key) => { if (value?.length > 0) { validCompareData = true; - } + } }); } From 9a90e20ab8f1cdcdaf6afd87a15099f133a18270 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Wed, 16 Apr 2025 16:10:06 +0530 Subject: [PATCH 2/2] Added version --- package-lock.json | 2 +- packages/contentstack-audit/README.md | 2 +- packages/contentstack-auth/README.md | 2 +- packages/contentstack-bootstrap/README.md | 2 +- packages/contentstack-branches/README.md | 2 +- packages/contentstack-branches/package.json | 2 +- packages/contentstack-bulk-publish/README.md | 2 +- packages/contentstack-clone/README.md | 2 +- packages/contentstack-config/README.md | 2 +- packages/contentstack-export/README.md | 2 +- packages/contentstack-import-setup/README.md | 2 +- packages/contentstack-import/README.md | 2 +- packages/contentstack-migrate-rte/README.md | 2 +- packages/contentstack-migration/README.md | 2 +- packages/contentstack/README.md | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9da2eaedec..e4bbd6ef80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25543,7 +25543,7 @@ }, "packages/contentstack-branches": { "name": "@contentstack/cli-cm-branches", - "version": "1.4.0", + "version": "1.4.1", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.5.0", diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md index 40cf11dd22..401cd86b09 100644 --- a/packages/contentstack-audit/README.md +++ b/packages/contentstack-audit/README.md @@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli-audit/1.12.0 darwin-arm64 node-v23.6.0 +@contentstack/cli-audit/1.12.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-auth/README.md b/packages/contentstack-auth/README.md index c087c01d9d..6da5a072e9 100644 --- a/packages/contentstack-auth/README.md +++ b/packages/contentstack-auth/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-auth/1.4.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-auth/1.4.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-bootstrap/README.md b/packages/contentstack-bootstrap/README.md index 9ba4cf5d90..947ec1f4b2 100644 --- a/packages/contentstack-bootstrap/README.md +++ b/packages/contentstack-bootstrap/README.md @@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md index ebc4b37958..160dfad2d2 100755 --- a/packages/contentstack-branches/README.md +++ b/packages/contentstack-branches/README.md @@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-branches/1.4.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-branches/1.4.1 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index 4f6d180355..942a9e7e84 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-branches", "description": "Contentstack CLI plugin to do branches operations", - "version": "1.4.0", + "version": "1.4.1", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md index a19a046ea5..09b4db8c45 100644 --- a/packages/contentstack-bulk-publish/README.md +++ b/packages/contentstack-bulk-publish/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-clone/README.md b/packages/contentstack-clone/README.md index 7ab4a83c4a..ea3bb5e467 100644 --- a/packages/contentstack-clone/README.md +++ b/packages/contentstack-clone/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-config/README.md b/packages/contentstack-config/README.md index 517ace8972..38b1ef06f6 100644 --- a/packages/contentstack-config/README.md +++ b/packages/contentstack-config/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-config/1.11.1 darwin-arm64 node-v23.6.0 +@contentstack/cli-config/1.11.1 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-export/README.md b/packages/contentstack-export/README.md index 0f479635dd..7c22e5448f 100755 --- a/packages/contentstack-export/README.md +++ b/packages/contentstack-export/README.md @@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-export/1.16.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-export/1.16.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-import-setup/README.md b/packages/contentstack-import-setup/README.md index f835d8b880..0121da0a7d 100644 --- a/packages/contentstack-import-setup/README.md +++ b/packages/contentstack-import-setup/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md index 4ef2f5579a..07ade7bcb6 100644 --- a/packages/contentstack-import/README.md +++ b/packages/contentstack-import/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import/1.21.1 darwin-arm64 node-v23.6.0 +@contentstack/cli-cm-import/1.21.1 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-migrate-rte/README.md b/packages/contentstack-migrate-rte/README.md index bffcec81d8..dc09d77982 100644 --- a/packages/contentstack-migrate-rte/README.md +++ b/packages/contentstack-migrate-rte/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-migrate-rte/1.5.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-cm-migrate-rte/1.5.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-migration/README.md b/packages/contentstack-migration/README.md index d5e5b943d3..f6fb61279c 100644 --- a/packages/contentstack-migration/README.md +++ b/packages/contentstack-migration/README.md @@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-migration/1.7.0 darwin-arm64 node-v22.14.0 +@contentstack/cli-migration/1.7.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md index eb3b7d32ae..1f49442555 100644 --- a/packages/contentstack/README.md +++ b/packages/contentstack/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli/1.40.0 darwin-arm64 node-v23.6.0 +@contentstack/cli/1.40.0 darwin-arm64 node-v23.11.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND @@ -3775,7 +3775,7 @@ USAGE $ csdx launch:functions [-p ] [-d ] FLAGS - -d, --data-dir= [default: /Users/raj.pandey/fuckyouFuck/cli/packages/contentstack] Current working directory + -d, --data-dir= [default: /Users/sunil.lakshman/Documents/cli/packages/contentstack] Current working directory -p, --port= [default: 3000] Port number DESCRIPTION