roboto-js 1.4.33 → 1.4.35

package/dist/cjs/rbt_api.cjs

@@ -716,7 +716,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
           defaultOrderBy,
           defaultLimit,
           mergedParams,
-          _paramsKey,
+          paramsKey,
           responsePromise,
           response,
           _args16 = arguments;
@@ -741,31 +741,30 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                 }
               }; // Merge defaults with provided params
               mergedParams = _objectSpread(_objectSpread(_objectSpread({}, defaultOrderBy), defaultLimit), params); // Check cache for an existing request
-              _paramsKey = JSON.stringify(mergedParams);
-              if (!this.requestCache[_paramsKey]) {
+              paramsKey = JSON.stringify(mergedParams);
+              if (!this.requestCache[paramsKey]) {
                 _context16.next = 10;
                 break;
               }
-              console.log("Returning cached request for params:", _paramsKey);
-              return _context16.abrupt("return", this.requestCache[_paramsKey]);
+              console.log("Returning cached request for params:", paramsKey);
+              return _context16.abrupt("return", this.requestCache[paramsKey]);
             case 10:
-              _context16.next = 12;
-              return this.axios.post('/object_service/queryObjects', [mergedParams]);
-            case 12:
-              responsePromise = _context16.sent;
-              // Store the promise in the cache
-              this.requestCache[_paramsKey] = responsePromise;
-              _context16.next = 16;
+              //
+              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;
               return responsePromise;
-            case 16:
+            case 14:
               response = _context16.sent;
-              delete this.requestCache[_paramsKey];
               if (!(response.data.ok === false)) {
-                _context16.next = 20;
+                _context16.next = 17;
                 break;
               }
               return _context16.abrupt("return", this._handleError(response));
-            case 20:
+            case 17:
               // Process items into RbtObject instances
               if (Array.isArray(response.data.items)) {
                 response.data.items = response.data.items.map(function (record) {
@@ -775,16 +774,15 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                 });
               }
               return _context16.abrupt("return", response.data.items);
-            case 24:
-              _context16.prev = 24;
+            case 21:
+              _context16.prev = 21;
               _context16.t0 = _context16["catch"](1);
-              delete this.requestCache[paramsKey];
               return _context16.abrupt("return", this._handleError(_context16.t0));
-            case 28:
+            case 24:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[1, 24]]);
+        }, _callee16, this, [[1, 21]]);
       }));
       function query(_x11) {
         return _query.apply(this, arguments);

package/dist/esm/rbt_api.js

@@ -364,12 +364,14 @@ export default class RbtApi {
       }
       //
 
-      const responsePromise = await this.axios.post('/object_service/queryObjects', [mergedParams]);
+      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;
       const response = await responsePromise;
-      delete this.requestCache[paramsKey];
       if (response.data.ok === false) {
         return this._handleError(response);
       }
@@ -382,7 +384,6 @@ export default class RbtApi {
       }
       return response.data.items;
     } catch (e) {
-      delete this.requestCache[paramsKey];
       return this._handleError(e);
     }
   }

package/package.json

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

package/src/rbt_api.js

@@ -424,14 +424,17 @@ export default class RbtApi {
       }
       //
 
-      const responsePromise = await this.axios.post('/object_service/queryObjects', [mergedParams]);
+      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;
 
       const response = await responsePromise;
-      delete this.requestCache[paramsKey];
-      
+
       if (response.data.ok === false) {
         return this._handleError(response);
       }
@@ -442,7 +445,6 @@ export default class RbtApi {
       }
       return response.data.items;
     } catch (e) {
-      delete this.requestCache[paramsKey];
       return this._handleError(e);
     }
   }