roboto-js 1.4.34 → 1.4.36

package/dist/cjs/rbt_api.cjs

@@ -743,26 +743,29 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               mergedParams = _objectSpread(_objectSpread(_objectSpread({}, defaultOrderBy), defaultLimit), params); // Check cache for an existing request
               _paramsKey = JSON.stringify(mergedParams);
               if (!this.requestCache[_paramsKey]) {
-                _context16.next = 10;
+                _context16.next = 9;
                 break;
               }
-              console.log("Returning cached request for params:", _paramsKey);
               return _context16.abrupt("return", this.requestCache[_paramsKey]);
-            case 10:
-              //
-              responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]); // Store the promise in the cache
+            case 9:
+              // Create the response promise and store it in the cache
+              responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams])["finally"](function () {
+                // Ensure that the cache is cleaned up after the promise settles
+                delete _this.requestCache[_paramsKey];
+              }); // Store the promise in the cache
               this.requestCache[_paramsKey] = responsePromise;
-              _context16.next = 14;
+
+              // Await the response from the API
+              _context16.next = 13;
               return responsePromise;
-            case 14:
+            case 13:
               response = _context16.sent;
-              delete this.requestCache[_paramsKey];
               if (!(response.data.ok === false)) {
-                _context16.next = 18;
+                _context16.next = 16;
                 break;
               }
               return _context16.abrupt("return", this._handleError(response));
-            case 18:
+            case 16:
               // Process items into RbtObject instances
               if (Array.isArray(response.data.items)) {
                 response.data.items = response.data.items.map(function (record) {
@@ -772,16 +775,16 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                 });
               }
               return _context16.abrupt("return", response.data.items);
-            case 22:
-              _context16.prev = 22;
+            case 20:
+              _context16.prev = 20;
               _context16.t0 = _context16["catch"](1);
-              delete this.requestCache[paramsKey];
+              delete this.requestCache[paramsKey]; // Ensure cache cleanup on error
               return _context16.abrupt("return", this._handleError(_context16.t0));
-            case 26:
+            case 24:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[1, 22]]);
+        }, _callee16, this, [[1, 20]]);
       }));
       function query(_x11) {
         return _query.apply(this, arguments);

package/dist/esm/rbt_api.js

@@ -359,30 +359,35 @@ export default class RbtApi {
       // Check cache for an existing request
       const paramsKey = JSON.stringify(mergedParams);
       if (this.requestCache[paramsKey]) {
-        console.log("Returning cached request for params:", paramsKey);
         return this.requestCache[paramsKey];
       }
-      //
 
-      const responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]);
+      // Create the response promise and store it in the cache
+      const responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]).finally(() => {
+        // Ensure that the cache is cleaned up after the promise settles
+        delete this.requestCache[paramsKey];
+      });
 
       // Store the promise in the cache
       this.requestCache[paramsKey] = responsePromise;
+
+      // Await the response from the API
       const response = await responsePromise;
-      delete this.requestCache[paramsKey];
       if (response.data.ok === false) {
         return this._handleError(response);
       }
 
       // Process items into RbtObject instances
       if (Array.isArray(response.data.items)) {
-        response.data.items = response.data.items.map(record => new RbtObject(record, this.axios, {
-          isNew: true
-        }));
+        response.data.items = response.data.items.map(record => {
+          return new RbtObject(record, this.axios, {
+            isNew: true
+          });
+        });
       }
       return response.data.items;
     } catch (e) {
-      delete this.requestCache[paramsKey];
+      delete this.requestCache[paramsKey]; // Ensure cache cleanup on error
       return this._handleError(e);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.4.34",
+  "version": "1.4.36",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/rbt_api.js

@@ -407,6 +407,7 @@ export default class RbtApi {
    */
   async query(type, params = {}) {
     try {
+      
       params.type = type;
 
       // Default ordering and pagination
@@ -419,18 +420,21 @@ export default class RbtApi {
       // Check cache for an existing request
       const paramsKey = JSON.stringify(mergedParams);
       if (this.requestCache[paramsKey]) {
-          console.log("Returning cached request for params:", paramsKey);
-          return this.requestCache[paramsKey];
+        return this.requestCache[paramsKey];
       }
-      //
 
-      const responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]);
+      // Create the response promise and store it in the cache
+      const responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams])
+        .finally(() => {
+          // Ensure that the cache is cleaned up after the promise settles
+          delete this.requestCache[paramsKey];
+        });
 
       // Store the promise in the cache
       this.requestCache[paramsKey] = responsePromise;
 
+      // Await the response from the API
       const response = await responsePromise;
-      delete this.requestCache[paramsKey];
 
       if (response.data.ok === false) {
         return this._handleError(response);
@@ -438,12 +442,18 @@ export default class RbtApi {
 
       // Process items into RbtObject instances
       if (Array.isArray(response.data.items)) {
-        response.data.items = response.data.items.map(record => new RbtObject(record, this.axios, { isNew: true }));
+        response.data.items = response.data.items.map(record => {
+          return new RbtObject(record, this.axios, { isNew: true });
+        });
       }
+
       return response.data.items;
+
     } catch (e) {
-      delete this.requestCache[paramsKey];
+
+      delete this.requestCache[paramsKey]; // Ensure cache cleanup on error
       return this._handleError(e);
+    
     }
   }