roboto-js 1.4.35 → 1.4.37

package/dist/cjs/rbt_api.cjs

@@ -716,7 +716,8 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
           defaultOrderBy,
           defaultLimit,
           mergedParams,
-          paramsKey,
+          currentTime,
+          cacheEntry,
           responsePromise,
           response,
           _args16 = arguments;
@@ -741,30 +742,34 @@ 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]) {
-                _context16.next = 10;
+              currentTime = Date.now();
+              cacheEntry = this.requestCache[paramsKey];
+              if (!(cacheEntry && currentTime - cacheEntry.time < 10000)) {
+                _context16.next = 11;
                 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])["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;
+              // 10000 ms = 10 seconds
+              console.log("Using cached request for params:", paramsKey);
+              return _context16.abrupt("return", cacheEntry.val);
+            case 11:
+              // Create the response promise and store it in the cache
+              responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]); // Store the promise along with the current time in the cache
+              this.requestCache[paramsKey] = {
+                val: responsePromise,
+                time: currentTime
+              };
+
+              // Await the response from the API
+              _context16.next = 15;
               return responsePromise;
-            case 14:
+            case 15:
               response = _context16.sent;
               if (!(response.data.ok === false)) {
-                _context16.next = 17;
+                _context16.next = 18;
                 break;
               }
               return _context16.abrupt("return", this._handleError(response));
-            case 17:
+            case 18:
               // Process items into RbtObject instances
               if (Array.isArray(response.data.items)) {
                 response.data.items = response.data.items.map(function (record) {
@@ -774,15 +779,16 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                 });
               }
               return _context16.abrupt("return", response.data.items);
-            case 21:
-              _context16.prev = 21;
+            case 22:
+              _context16.prev = 22;
               _context16.t0 = _context16["catch"](1);
+              delete this.requestCache[paramsKey]; // Ensure cache cleanup on error
               return _context16.abrupt("return", this._handleError(_context16.t0));
-            case 24:
+            case 26:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[1, 21]]);
+        }, _callee16, this, [[1, 22]]);
       }));
       function query(_x11) {
         return _query.apply(this, arguments);

package/dist/esm/rbt_api.js

@@ -357,20 +357,24 @@ 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 currentTime = Date.now();
+      const cacheEntry = this.requestCache[paramsKey];
+      if (cacheEntry && currentTime - cacheEntry.time < 10000) {
+        // 10000 ms = 10 seconds
+        console.log("Using cached request for params:", paramsKey);
+        return cacheEntry.val;
       }
-      //
 
-      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];
-      });
+      // Create the response promise and store it in the cache
+      const responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]);
+
+      // Store the promise along with the current time in the cache
+      this.requestCache[paramsKey] = {
+        val: responsePromise,
+        time: currentTime
+      };
 
-      // Store the promise in the cache
-      this.requestCache[paramsKey] = responsePromise;
+      // Await the response from the API
       const response = await responsePromise;
       if (response.data.ok === false) {
         return this._handleError(response);
@@ -378,12 +382,15 @@ 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]; // Ensure cache cleanup on error
       return this._handleError(e);
     }
   }

package/package.json

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

package/src/rbt_api.js

@@ -406,7 +406,9 @@ export default class RbtApi {
    * Note: A default orderBy is applied if none is provided, ordering items by 'timeCreated' in descending order.
    */
   async query(type, params = {}) {
+
     try {
+
       params.type = type;
 
       // Default ordering and pagination
@@ -417,22 +419,20 @@ export default class RbtApi {
       const mergedParams = { ...defaultOrderBy, ...defaultLimit, ...params };
 
       // 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 currentTime = Date.now();
+      const cacheEntry = this.requestCache[paramsKey];
+      if (cacheEntry && (currentTime - cacheEntry.time) < 10000) {  // 10000 ms = 10 seconds
+        console.log("Using cached request for params:", paramsKey);
+        return cacheEntry.val;
       }
-      //
 
-      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];
-        });
+      // Create the response promise and store it in the cache
+      const responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]);
 
-      // Store the promise in the cache
-      this.requestCache[paramsKey] = responsePromise;
+      // Store the promise along with the current time in the cache
+      this.requestCache[paramsKey] = { val: responsePromise, time: currentTime };
 
+      // Await the response from the API
       const response = await responsePromise;
 
       if (response.data.ok === false) {
@@ -441,12 +441,20 @@ 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]; // Ensure cache cleanup on error
       return this._handleError(e);
+    
     }
+
   }
 
   /**