From 3a2aef1f80ee7f899825b559055e92e864adb6d5 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:05:51 +0530 Subject: [PATCH 1/3] Refactor getCacheCallback to directly use parent promise's resolve and reject, simplifying error handling and avoiding nested promises. --- src/core/lib/utils.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/core/lib/utils.js b/src/core/lib/utils.js index 121fb413..1e31feb5 100755 --- a/src/core/lib/utils.js +++ b/src/core/lib/utils.js @@ -252,19 +252,20 @@ export function sendRequest(queryObject, options) { } } - let getCacheCallback = function() { + let getCacheCallback = function(resolve, reject) { return function(err, entries) { - return new Promise(function(resolve, reject) { - try { - if (err) reject(err); - if (!tojson) entries = resultWrapper(entries); - resolve(spreadResult(entries)); - } catch (e) { - reject(e) + try { + if (err) { + return reject(err); // Propagate the error to the parent promise } - }); - } - } + if (!tojson) entries = resultWrapper(entries); + resolve(spreadResult(entries)); // Propagate the result to the parent promise + } catch (e) { + reject(e); // Handle any synchronous errors + } + }; + }; + let callback = function(continueFlag, resolve, reject) { if (continueFlag) { @@ -339,11 +340,12 @@ export function sendRequest(queryObject, options) { }.bind(self)) .catch(function(error) { if (cachePolicy === 2 && self.provider !== null) { - self.provider.get(hashQuery, getCacheCallback()); + self.provider.get(hashQuery, getCacheCallback(resolve, reject)); } else { - return reject(error); + reject(error); } }); + } } switch (cachePolicy) { From b89e8660ca9c80b5c027ced29b1e800d44baa7ee Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:09:34 +0530 Subject: [PATCH 2/3] Updated utils.js file --- src/core/lib/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/lib/utils.js b/src/core/lib/utils.js index 1e31feb5..d0256c1e 100755 --- a/src/core/lib/utils.js +++ b/src/core/lib/utils.js @@ -292,7 +292,7 @@ export function sendRequest(queryObject, options) { if (err || !_data || (_data.entries.length === 0 && _data.assets.length === 0)) { return reject({ error_code: 141, error_message: 'The requested entry doesn\'t exist.' }); } - getCacheCallback()(err, _data); + getCacheCallback(resolve, reject)(err, _data); }); return } else { From 7f7069ac55c2c5f920f4f81909578055265f519a Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:27:47 +0530 Subject: [PATCH 3/3] Fixed empty object error when API throw error --- CHANGELOG.md | 11 +++++++++++ package-lock.json | 4 ++-- package.json | 2 +- src/core/lib/utils.js | 7 ++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d6b00b..16ba84ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,15 @@ ## Change log +### Version: 3.24.1 +#### Date: January-27-2025 +##### Fix: + - Added HTTP error codes in the findOne method + +### Version: 3.24.0 +#### Date: January-27-2025 +##### Enhancement: + - updateasseturl for handling jrte within blocks + - version bumps + - Fixed testcases ### Version: 3.23.0 #### Date: December-05-2024 diff --git a/package-lock.json b/package-lock.json index 4c44965e..41ae4da3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "contentstack", - "version": "3.24.0", + "version": "3.24.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "contentstack", - "version": "3.24.0", + "version": "3.24.1", "license": "MIT", "dependencies": { "@contentstack/utils": "^1.3.15", diff --git a/package.json b/package.json index 94e20ac5..686bcf7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "contentstack", - "version": "3.24.0", + "version": "3.24.1", "description": "Contentstack Javascript SDK", "homepage": "https://www.contentstack.com/", "author": { diff --git a/src/core/lib/utils.js b/src/core/lib/utils.js index d0256c1e..05af3cd1 100755 --- a/src/core/lib/utils.js +++ b/src/core/lib/utils.js @@ -339,11 +339,12 @@ export function sendRequest(queryObject, options) { } }.bind(self)) .catch(function(error) { - if (cachePolicy === 2 && self.provider !== null) { - self.provider.get(hashQuery, getCacheCallback(resolve, reject)); - } else { + if(error){ reject(error); } + else if (cachePolicy === 2 && self.provider !== null) { + self.provider.get(hashQuery, getCacheCallback(resolve, reject)); + } }); }