Refactor getCacheCallback to directly use parent promise's resolve an…

…d reject, simplifying error handling and avoiding nested promises.
contentstack · Jan 23, 2025 · 3a2aef1 · 3a2aef1
1 parent be96351
commit 3a2aef1
Showing 1 changed file with 15 additions and 13 deletions.
diff --git 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) {