roboto-js 1.6.18 → 1.7.1

package/dist/cjs/rbt_api.cjs

@@ -13,12 +13,19 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _idb = require("idb");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -36,6 +43,15 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
       localStorageAdaptor = _ref$localStorageAdap === void 0 ? null : _ref$localStorageAdap;
     _classCallCheck(this, RbtApi);
     this.websocketClient = null;
+
+    // Object cache for sharing instances across multiple load() calls
+    this._objectCache = new Map();
+
+    // Track pending requests to prevent duplicate loads
+    this._pendingLoads = new Map();
+
+    // Track what we've already logged to reduce console spam
+    this._loggedCacheEvents = new Set();
     this.axios = _axios["default"].create({
       baseURL: baseUrl,
       headers: {
@@ -60,10 +76,35 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
         }
       };
     }
+
+    // Synchronous browser hydration: set auth header and in-memory user immediately
+    if (typeof localStorage !== 'undefined') {
+      try {
+        var token = localStorage.getItem('authtoken');
+        if (token) {
+          this.authtoken = token;
+          this.axios.defaults.headers.common['authtoken'] = token;
+        }
+      } catch (_unused) {}
+      try {
+        var cachedUser = localStorage.getItem('rbtUser');
+        if (cachedUser) {
+          var parsed = JSON.parse(cachedUser);
+          if (parsed && parsed.id) {
+            this.currentUser = new _rbt_user["default"]({
+              id: parsed.id
+            }, this.axios);
+            this.currentUser.setData(parsed);
+          }
+        }
+      } catch (_unused2) {}
+    }
     this.localDb = null;
     this.iac_session = null;
     this.appServiceHost = baseUrl;
     this.requestCache = {};
+    this._loadCurrentUserPromise = null;
+    this._loadCurrentUserExtendedPromise = null;
 
     // Use the storageAdaptor to get the authToken, if available
     this.initAuthToken(authtoken);
@@ -72,21 +113,104 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   _createClass(RbtApi, [{
     key: "getWebSocketClient",
     value: function getWebSocketClient() {
-      if (this.websocketClient) return this.websocketClient;
+      // Reuse existing WebSocket if it's OPEN or CONNECTING (to prevent race condition)
+      if (this.websocketClient && (this.websocketClient.readyState === WebSocket.OPEN || this.websocketClient.readyState === WebSocket.CONNECTING)) {
+        return this.websocketClient;
+      }
       var baseUrl = this.axios.defaults.baseURL;
       var wsProtocol = baseUrl.startsWith('https') ? 'wss://' : 'ws://';
       var wsUrl = baseUrl.replace(/^https?:\/\//, wsProtocol);
+      console.log('[RbtApi] Creating new WebSocket connection to:', wsUrl + '/realtime');
       this.websocketClient = new WebSocket("".concat(wsUrl, "/realtime"));
-      this.websocketClient.onopen = function () {
+      this._setupWebSocketHandlers(this.websocketClient);
+      return this.websocketClient;
+    }
+  }, {
+    key: "_setupWebSocketHandlers",
+    value: function _setupWebSocketHandlers(ws) {
+      var _this = this;
+      ws.onopen = function () {
         console.log('[RbtApi] WebSocket connected.');
+        _this._wsReconnectAttempts = 0;
+        _this._wsConnected = true;
+
+        // Re-subscribe to all objects that were previously subscribed
+        if (_this._wsSubscriptions) {
+          var _iterator = _createForOfIteratorHelper(_this._wsSubscriptions),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var objectId = _step.value;
+              ws.send(JSON.stringify({
+                type: 'subscribe',
+                objectId: objectId
+              }));
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
       };
-      this.websocketClient.onclose = function () {
-        console.warn('[RbtApi] WebSocket closed.');
+      ws.onclose = function (event) {
+        console.warn('[RbtApi] WebSocket closed:', event.code, event.reason);
+        _this._wsConnected = false;
+
+        // Attempt reconnection with exponential backoff
+        if (!_this._wsManualClose && _this._wsReconnectAttempts < 5) {
+          var delay = Math.min(1000 * Math.pow(2, _this._wsReconnectAttempts), 30000);
+          console.log("[RbtApi] Attempting reconnection in ".concat(delay, "ms (attempt ").concat(_this._wsReconnectAttempts + 1, "/5)"));
+          setTimeout(function () {
+            _this._wsReconnectAttempts++;
+            _this.websocketClient = null; // Clear the old connection
+            _this.getWebSocketClient(); // Create new connection
+          }, delay);
+        }
       };
-      this.websocketClient.onerror = function (err) {
-        console.error('[RbtApi] WebSocket error:', err.message || err);
+      ws.onerror = function (err) {
+        console.error('[RbtApi] WebSocket error:', err);
+        _this._wsConnected = false;
       };
-      return this.websocketClient;
+
+      // Handle ping/pong for keep-alive
+      ws.addEventListener('ping', function () {
+        if (ws.readyState === WebSocket.OPEN) {
+          ws.pong();
+        }
+      });
+
+      // Initialize connection tracking
+      this._wsReconnectAttempts = this._wsReconnectAttempts || 0;
+      this._wsConnected = false;
+      this._wsManualClose = false;
+      this._wsSubscriptions = this._wsSubscriptions || new Set();
+    }
+
+    // Method to track subscriptions for reconnection
+  }, {
+    key: "_trackSubscription",
+    value: function _trackSubscription(objectId) {
+      if (!this._wsSubscriptions) this._wsSubscriptions = new Set();
+      this._wsSubscriptions.add(objectId);
+    }
+  }, {
+    key: "_untrackSubscription",
+    value: function _untrackSubscription(objectId) {
+      if (this._wsSubscriptions) {
+        this._wsSubscriptions["delete"](objectId);
+      }
+    }
+
+    // Method to gracefully close WebSocket
+  }, {
+    key: "closeWebSocket",
+    value: function closeWebSocket() {
+      if (this.websocketClient) {
+        this._wsManualClose = true;
+        this.websocketClient.close();
+        this.websocketClient = null;
+      }
     }
   }, {
     key: "initAuthToken",
@@ -244,7 +368,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
     key: "login",
     value: (function () {
       var _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        var response;
+        var response, _this$iac_session;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -272,22 +396,29 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               this.axios.defaults.headers.common['authtoken'] = response.data.authToken;
               this.authtoken = response.data.authToken;
               if (!this.localStorageAdaptor) {
-                _context5.next = 13;
+                _context5.next = 16;
                 break;
               }
               _context5.next = 13;
               return this.localStorageAdaptor.setItem('authtoken', response.data.authToken);
             case 13:
-              return _context5.abrupt("return", response.data);
+              if (!((_this$iac_session = this.iac_session) !== null && _this$iac_session !== void 0 && _this$iac_session.user)) {
+                _context5.next = 16;
+                break;
+              }
+              _context5.next = 16;
+              return this.localStorageAdaptor.setItem('rbtUser', JSON.stringify(this.iac_session.user));
             case 16:
-              _context5.prev = 16;
+              return _context5.abrupt("return", response.data);
+            case 19:
+              _context5.prev = 19;
               _context5.t0 = _context5["catch"](0);
               this._handleError(_context5.t0);
-            case 19:
+            case 22:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 16]]);
+        }, _callee5, this, [[0, 19]]);
       }));
       function login(_x4) {
         return _login.apply(this, arguments);
@@ -402,58 +533,91 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "loadCurrentUser",
     value: function () {
-      var _loadCurrentUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var response, _response$user;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _loadCurrentUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var _this2 = this;
+        var result;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context8.prev = 0;
-              if (!this.currentUser) {
-                _context8.next = 3;
+              _context9.prev = 0;
+              if (!this._loadCurrentUserPromise) {
+                _context9.next = 3;
                 break;
               }
-              return _context8.abrupt("return", this.currentUser);
+              return _context9.abrupt("return", this._loadCurrentUserPromise);
             case 3:
-              if (!this.apikey) {
-                _context8.next = 7;
+              if (!this.currentUser) {
+                _context9.next = 5;
                 break;
               }
-              return _context8.abrupt("return", null);
-            case 7:
-              if (!this.authtoken) {
-                _context8.next = 17;
+              return _context9.abrupt("return", this.currentUser);
+            case 5:
+              if (!this.apikey) {
+                _context9.next = 9;
                 break;
               }
-              _context8.next = 10;
-              return this.refreshAuthToken(this.authtoken);
-            case 10:
-              response = _context8.sent;
-              if (response) {
-                _context8.next = 13;
+              return _context9.abrupt("return", null);
+            case 9:
+              if (!this.authtoken) {
+                _context9.next = 18;
                 break;
               }
-              return _context8.abrupt("return", null);
+              this._loadCurrentUserPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+                var response, _response$user;
+                return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                  while (1) switch (_context8.prev = _context8.next) {
+                    case 0:
+                      _context8.next = 2;
+                      return _this2.refreshAuthToken(_this2.authtoken);
+                    case 2:
+                      response = _context8.sent;
+                      if (response) {
+                        _context8.next = 5;
+                        break;
+                      }
+                      return _context8.abrupt("return", null);
+                    case 5:
+                      if (!(response !== null && response !== void 0 && response.user)) {
+                        _context8.next = 11;
+                        break;
+                      }
+                      _this2.currentUser = new _rbt_user["default"]({
+                        id: response === null || response === void 0 || (_response$user = response.user) === null || _response$user === void 0 ? void 0 : _response$user.id
+                      }, _this2.axios);
+                      _this2.currentUser.setData(response.user);
+                      if (!_this2.localStorageAdaptor) {
+                        _context8.next = 11;
+                        break;
+                      }
+                      _context8.next = 11;
+                      return _this2.localStorageAdaptor.setItem('rbtUser', JSON.stringify(response.user));
+                    case 11:
+                      return _context8.abrupt("return", _this2.currentUser);
+                    case 12:
+                    case "end":
+                      return _context8.stop();
+                  }
+                }, _callee8);
+              }))();
+              _context9.next = 13;
+              return this._loadCurrentUserPromise;
             case 13:
-              if (response !== null && response !== void 0 && response.user) {
-                this.currentUser = new _rbt_user["default"]({
-                  id: response === null || response === void 0 || (_response$user = response.user) === null || _response$user === void 0 ? void 0 : _response$user.id
-                }, this.axios);
-                this.currentUser.setData(response.user);
-              }
-              return _context8.abrupt("return", this.currentUser);
-            case 17:
-              this.currentUser = null;
+              result = _context9.sent;
+              this._loadCurrentUserPromise = null;
+              return _context9.abrupt("return", result);
             case 18:
-              return _context8.abrupt("return", null);
-            case 21:
-              _context8.prev = 21;
-              _context8.t0 = _context8["catch"](0);
-              return _context8.abrupt("return", this._handleError(_context8.t0));
-            case 24:
+              this.currentUser = null;
+            case 19:
+              return _context9.abrupt("return", null);
+            case 22:
+              _context9.prev = 22;
+              _context9.t0 = _context9["catch"](0);
+              return _context9.abrupt("return", this._handleError(_context9.t0));
+            case 25:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this, [[0, 21]]);
+        }, _callee9, this, [[0, 22]]);
       }));
       function loadCurrentUser() {
         return _loadCurrentUser.apply(this, arguments);
@@ -463,35 +627,35 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "confirmUserEmail",
     value: function () {
-      var _confirmUserEmail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(confirmCode) {
+      var _confirmUserEmail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(confirmCode) {
         var params, response;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               params = {
                 emailConfirmCode: confirmCode
               };
-              _context9.prev = 1;
-              _context9.next = 4;
+              _context10.prev = 1;
+              _context10.next = 4;
               return this.axios.post('/user_service/confirmUserEmail', [params]);
             case 4:
-              response = _context9.sent;
+              response = _context10.sent;
               if (!(response.data.ok === false)) {
-                _context9.next = 7;
+                _context10.next = 7;
                 break;
               }
-              return _context9.abrupt("return", this._handleError(response));
+              return _context10.abrupt("return", this._handleError(response));
             case 7:
-              return _context9.abrupt("return", response.data);
+              return _context10.abrupt("return", response.data);
             case 10:
-              _context9.prev = 10;
-              _context9.t0 = _context9["catch"](1);
-              return _context9.abrupt("return", this._handleError(_context9.t0));
+              _context10.prev = 10;
+              _context10.t0 = _context10["catch"](1);
+              return _context10.abrupt("return", this._handleError(_context10.t0));
             case 13:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[1, 10]]);
+        }, _callee10, this, [[1, 10]]);
       }));
       function confirmUserEmail(_x6) {
         return _confirmUserEmail.apply(this, arguments);
@@ -501,27 +665,53 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "loadCurrentUserExtended",
     value: function () {
-      var _loadCurrentUserExtended = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        var currentUser;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _loadCurrentUserExtended = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var _this3 = this;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context10.next = 2;
-              return this.loadCurrentUser();
-            case 2:
-              currentUser = _context10.sent;
-              if (!currentUser) {
-                _context10.next = 7;
+              if (!this._loadCurrentUserExtendedPromise) {
+                _context12.next = 2;
                 break;
               }
-              return _context10.abrupt("return", this.loadUser(currentUser.id));
+              return _context12.abrupt("return", this._loadCurrentUserExtendedPromise);
+            case 2:
+              this._loadCurrentUserExtendedPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+                var currentUser;
+                return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                  while (1) switch (_context11.prev = _context11.next) {
+                    case 0:
+                      _context11.next = 2;
+                      return _this3.loadCurrentUser();
+                    case 2:
+                      currentUser = _context11.sent;
+                      if (!currentUser) {
+                        _context11.next = 7;
+                        break;
+                      }
+                      return _context11.abrupt("return", _this3.loadUser(currentUser.id));
+                    case 7:
+                      return _context11.abrupt("return", null);
+                    case 8:
+                    case "end":
+                      return _context11.stop();
+                  }
+                }, _callee11);
+              }))();
+              _context12.prev = 3;
+              _context12.next = 6;
+              return this._loadCurrentUserExtendedPromise;
+            case 6:
+              return _context12.abrupt("return", _context12.sent);
             case 7:
-              return _context10.abrupt("return", null);
-            case 8:
+              _context12.prev = 7;
+              this._loadCurrentUserExtendedPromise = null;
+              return _context12.finish(7);
+            case 10:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this, [[3,, 7, 10]]);
       }));
       function loadCurrentUserExtended() {
         return _loadCurrentUserExtended.apply(this, arguments);
@@ -531,34 +721,64 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "loadUser",
     value: function () {
-      var _loadUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(userId) {
-        var params, _response$data, response, userData, User;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _loadUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(userId) {
+        var _this4 = this;
+        var params, cacheKey, now, existing, p;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               params = {
                 id: userId
               };
-              _context11.prev = 1;
-              _context11.next = 4;
-              return this.axios.post('/user_service/loadUser', [params]);
-            case 4:
-              response = _context11.sent;
-              userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
-              User = new _rbt_user["default"]({
-                id: userData.id
-              }, this.axios);
-              User.setData(userData);
-              return _context11.abrupt("return", User);
+              cacheKey = "loadUser:".concat(userId);
+              now = Date.now();
+              existing = this.requestCache[cacheKey];
+              if (!(existing && now - existing.time < 10000)) {
+                _context14.next = 6;
+                break;
+              }
+              return _context14.abrupt("return", existing.val);
+            case 6:
+              _context14.prev = 6;
+              p = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+                var _response$data;
+                var response, userData, User;
+                return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+                  while (1) switch (_context13.prev = _context13.next) {
+                    case 0:
+                      _context13.next = 2;
+                      return _this4.axios.post('/user_service/loadUser', [params]);
+                    case 2:
+                      response = _context13.sent;
+                      userData = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.user;
+                      User = new _rbt_user["default"]({
+                        id: userData.id
+                      }, _this4.axios);
+                      User.setData(userData);
+                      return _context13.abrupt("return", User);
+                    case 7:
+                    case "end":
+                      return _context13.stop();
+                  }
+                }, _callee13);
+              }))();
+              this.requestCache[cacheKey] = {
+                val: p,
+                time: now
+              };
+              _context14.next = 11;
+              return p;
             case 11:
-              _context11.prev = 11;
-              _context11.t0 = _context11["catch"](1);
-              return _context11.abrupt("return", this._handleError(_context11.t0));
+              return _context14.abrupt("return", _context14.sent);
             case 14:
+              _context14.prev = 14;
+              _context14.t0 = _context14["catch"](6);
+              return _context14.abrupt("return", this._handleError(_context14.t0));
+            case 17:
             case "end":
-              return _context11.stop();
+              return _context14.stop();
           }
-        }, _callee11, this, [[1, 11]]);
+        }, _callee14, this, [[6, 14]]);
       }));
       function loadUser(_x7) {
         return _loadUser.apply(this, arguments);
@@ -568,52 +788,52 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "refreshAuthToken",
     value: function () {
-      var _refreshAuthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(authtoken) {
+      var _refreshAuthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(authtoken) {
         var promise, response;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               if (this.appServiceHost) {
-                _context12.next = 3;
+                _context15.next = 3;
                 break;
               }
               console.warn('RBTTOK not initialized');
-              return _context12.abrupt("return", false);
+              return _context15.abrupt("return", false);
             case 3:
               if (!this.requestCache[authtoken]) {
-                _context12.next = 5;
+                _context15.next = 5;
                 break;
               }
-              return _context12.abrupt("return", this.requestCache[authtoken]);
+              return _context15.abrupt("return", this.requestCache[authtoken]);
             case 5:
-              _context12.prev = 5;
+              _context15.prev = 5;
               //console.log('RBTTOK Req', authtoken);
               // Create a new promise for the token refresh and store it in the cache
               promise = this.axios.post('/user_service/refreshAuthToken', [authtoken]);
               this.requestCache[authtoken] = promise;
 
               // Await the promise to get the response
-              _context12.next = 10;
+              _context15.next = 10;
               return promise;
             case 10:
-              response = _context12.sent;
+              response = _context15.sent;
               //console.log('RBTTOK Response ',response);
               // Once the promise resolves, delete it from the cache to allow future refreshes
               delete this.requestCache[authtoken];
 
               // Return the response data
-              return _context12.abrupt("return", response.data);
+              return _context15.abrupt("return", response.data);
             case 15:
-              _context12.prev = 15;
-              _context12.t0 = _context12["catch"](5);
+              _context15.prev = 15;
+              _context15.t0 = _context15["catch"](5);
               // On error, remove the cached promise to allow retries
               delete this.requestCache[authtoken];
-              this._handleError(_context12.t0);
+              this._handleError(_context15.t0);
             case 19:
             case "end":
-              return _context12.stop();
+              return _context15.stop();
           }
-        }, _callee12, this, [[5, 15]]);
+        }, _callee15, this, [[5, 15]]);
       }));
       function refreshAuthToken(_x8) {
         return _refreshAuthToken.apply(this, arguments);
@@ -646,31 +866,31 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "registerUser",
     value: function () {
-      var _registerUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _registerUser = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
         var dataHash,
           response,
           record,
-          _args13 = arguments;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+          _args16 = arguments;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              dataHash = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
-              _context13.prev = 1;
-              _context13.next = 4;
+              dataHash = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
+              _context16.prev = 1;
+              _context16.next = 4;
               return this.axios.post('/user_service/registerUser', [dataHash]);
             case 4:
-              response = _context13.sent;
+              response = _context16.sent;
               record = response.data;
-              return _context13.abrupt("return", new _rbt_user["default"](record, this.axios));
+              return _context16.abrupt("return", new _rbt_user["default"](record, this.axios));
             case 9:
-              _context13.prev = 9;
-              _context13.t0 = _context13["catch"](1);
-              return _context13.abrupt("return", this._handleError(_context13.t0));
+              _context16.prev = 9;
+              _context16.t0 = _context16["catch"](1);
+              return _context16.abrupt("return", this._handleError(_context16.t0));
             case 12:
             case "end":
-              return _context13.stop();
+              return _context16.stop();
           }
-        }, _callee13, this, [[1, 9]]);
+        }, _callee16, this, [[1, 9]]);
       }));
       function registerUser() {
         return _registerUser.apply(this, arguments);
@@ -687,30 +907,30 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "createFile",
     value: (function () {
-      var _createFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(dataHash) {
+      var _createFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(dataHash) {
         var response, record;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _context14.prev = 0;
-              _context14.next = 3;
+              _context17.prev = 0;
+              _context17.next = 3;
               return this.axios.post('/object_service/createObject', ['<@filekit.file>', dataHash]);
             case 3:
-              response = _context14.sent;
+              response = _context17.sent;
               record = response.data;
               if (dataHash) {
                 record.data = dataHash;
               }
-              return _context14.abrupt("return", new _rbt_file["default"](record, this.axios, this.localDb));
+              return _context17.abrupt("return", new _rbt_file["default"](record, this.axios, this.localDb));
             case 9:
-              _context14.prev = 9;
-              _context14.t0 = _context14["catch"](0);
-              return _context14.abrupt("return", this._handleError(_context14.t0));
+              _context17.prev = 9;
+              _context17.t0 = _context17["catch"](0);
+              return _context17.abrupt("return", this._handleError(_context17.t0));
             case 12:
             case "end":
-              return _context14.stop();
+              return _context17.stop();
           }
-        }, _callee14, this, [[0, 9]]);
+        }, _callee17, this, [[0, 9]]);
       }));
       function createFile(_x9) {
         return _createFile.apply(this, arguments);
@@ -720,33 +940,33 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "loadFile",
     value: function () {
-      var _loadFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(id) {
+      var _loadFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(id) {
         var response, record;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context15.prev = 0;
-              _context15.next = 3;
+              _context18.prev = 0;
+              _context18.next = 3;
               return this.load('<@filekit.file>', id);
             case 3:
-              response = _context15.sent;
+              response = _context18.sent;
               if (response) {
-                _context15.next = 6;
+                _context18.next = 6;
                 break;
               }
-              return _context15.abrupt("return", null);
+              return _context18.abrupt("return", null);
             case 6:
               record = response.toRecord();
-              return _context15.abrupt("return", new _rbt_file["default"](record, this.axios, this.localDb));
+              return _context18.abrupt("return", new _rbt_file["default"](record, this.axios, this.localDb));
             case 10:
-              _context15.prev = 10;
-              _context15.t0 = _context15["catch"](0);
-              return _context15.abrupt("return", this._handleError(_context15.t0));
+              _context18.prev = 10;
+              _context18.t0 = _context18["catch"](0);
+              return _context18.abrupt("return", this._handleError(_context18.t0));
             case 13:
             case "end":
-              return _context15.stop();
+              return _context18.stop();
           }
-        }, _callee15, this, [[0, 10]]);
+        }, _callee18, this, [[0, 10]]);
       }));
       function loadFile(_x10) {
         return _loadFile.apply(this, arguments);
@@ -756,37 +976,37 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "loadFiles",
     value: function () {
-      var _loadFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(ids) {
-        var _this = this;
+      var _loadFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(ids) {
+        var _this5 = this;
         var responses;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context16.prev = 0;
-              _context16.next = 3;
+              _context19.prev = 0;
+              _context19.next = 3;
               return this.load('<@filekit.file>', ids);
             case 3:
-              responses = _context16.sent;
+              responses = _context19.sent;
               if (!(!responses || !Array.isArray(responses))) {
-                _context16.next = 6;
+                _context19.next = 6;
                 break;
               }
-              return _context16.abrupt("return", []);
+              return _context19.abrupt("return", []);
             case 6:
-              return _context16.abrupt("return", responses.map(function (response) {
+              return _context19.abrupt("return", responses.map(function (response) {
                 var record = response.toRecord();
-                return new _rbt_file["default"](record, _this.axios, _this.localDb);
+                return new _rbt_file["default"](record, _this5.axios, _this5.localDb);
               }));
             case 9:
-              _context16.prev = 9;
-              _context16.t0 = _context16["catch"](0);
-              this._handleError(_context16.t0); // Handle errors (log or process as needed)
-              return _context16.abrupt("return", []);
+              _context19.prev = 9;
+              _context19.t0 = _context19["catch"](0);
+              this._handleError(_context19.t0); // Handle errors (log or process as needed)
+              return _context19.abrupt("return", []);
             case 13:
             case "end":
-              return _context16.stop();
+              return _context19.stop();
           }
-        }, _callee16, this, [[0, 9]]);
+        }, _callee19, this, [[0, 9]]);
       }));
       function loadFiles(_x11) {
         return _loadFiles.apply(this, arguments);
@@ -798,42 +1018,46 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
      *
      * @param {string} type - The type of object to create.
      * @param {Object} dataHash - The data for the new object.
+     * @param {Object} options - Additional options including enableRealtime.
      * @returns {Promise<RbtObject>} - The newly created object as an RbtObject.
      */
   }, {
     key: "create",
     value: (function () {
-      var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(type) {
+      var _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(type) {
         var dataHash,
+          options,
           response,
           record,
-          _args17 = arguments;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+          _args20 = arguments;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              dataHash = _args17.length > 1 && _args17[1] !== undefined ? _args17[1] : {};
-              _context17.prev = 1;
-              _context17.next = 4;
+              dataHash = _args20.length > 1 && _args20[1] !== undefined ? _args20[1] : {};
+              options = _args20.length > 2 && _args20[2] !== undefined ? _args20[2] : {};
+              _context20.prev = 2;
+              _context20.next = 5;
               return this.axios.post('/object_service/createObject', [type, dataHash]);
-            case 4:
-              response = _context17.sent;
+            case 5:
+              response = _context20.sent;
               record = response.data;
               if (dataHash) {
                 record.data = dataHash;
               }
-              return _context17.abrupt("return", new _rbt_object["default"](record, this.axios, {
+              return _context20.abrupt("return", new _rbt_object["default"](record, this.axios, {
                 isNew: true,
-                websocketClient: this.websocketClient
+                websocketClient: this.websocketClient,
+                enableRealtime: options.enableRealtime || false
               }));
-            case 10:
-              _context17.prev = 10;
-              _context17.t0 = _context17["catch"](1);
-              return _context17.abrupt("return", this._handleError(_context17.t0));
-            case 13:
+            case 11:
+              _context20.prev = 11;
+              _context20.t0 = _context20["catch"](2);
+              return _context20.abrupt("return", this._handleError(_context20.t0));
+            case 14:
             case "end":
-              return _context17.stop();
+              return _context20.stop();
           }
-        }, _callee17, this, [[1, 10]]);
+        }, _callee20, this, [[2, 11]]);
       }));
       function create(_x12) {
         return _create.apply(this, arguments);
@@ -872,8 +1096,8 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "query",
     value: (function () {
-      var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(type) {
-        var _this2 = this;
+      var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(type) {
+        var _this6 = this;
         var params,
           paramsKey,
           defaultOrderBy,
@@ -883,12 +1107,12 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
           cacheEntry,
           responsePromise,
           processingPromise,
-          _args18 = arguments;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+          _args21 = arguments;
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              params = _args18.length > 1 && _args18[1] !== undefined ? _args18[1] : {};
-              _context18.prev = 1;
+              params = _args21.length > 1 && _args21[1] !== undefined ? _args21[1] : {};
+              _context21.prev = 1;
               //console.log('RBTAPI.query INIT', type, params);
               params.type = type;
 
@@ -910,19 +1134,19 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               paramsKey = JSON.stringify(mergedParams);
               cacheEntry = this.requestCache[paramsKey];
               if (!(cacheEntry && currentTime - cacheEntry.time < 10000)) {
-                _context18.next = 11;
+                _context21.next = 11;
                 break;
               }
-              return _context18.abrupt("return", cacheEntry.val);
+              return _context21.abrupt("return", cacheEntry.val);
             case 11:
               // Create the response promise
               responsePromise = this.axios.post('/object_service/queryObjects', [mergedParams]); // Cache the promise of processing data, not just the raw response
               processingPromise = responsePromise.then(function (response) {
-                return _this2._processResponseData(response);
+                return _this6._processResponseData(response, params);
               })["catch"](function (e) {
-                delete _this2.requestCache[paramsKey]; // Ensure cache cleanup on failure
+                delete _this6.requestCache[paramsKey]; // Ensure cache cleanup on failure
                 //console.log('RBTAPI.query ERROR (Processing)', paramsKey, e);
-                return _this2._handleError(e);
+                return _this6._handleError(e);
               }); // Store the promise of the processed data in the cache
               this.requestCache[paramsKey] = {
                 val: processingPromise,
@@ -930,21 +1154,21 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               };
 
               // Await the processing promise for this call to get processed data
-              _context18.next = 16;
+              _context21.next = 16;
               return processingPromise;
             case 16:
-              return _context18.abrupt("return", _context18.sent);
+              return _context21.abrupt("return", _context21.sent);
             case 19:
-              _context18.prev = 19;
-              _context18.t0 = _context18["catch"](1);
+              _context21.prev = 19;
+              _context21.t0 = _context21["catch"](1);
               delete this.requestCache[paramsKey]; // Ensure cache cleanup on error
               //console.log('RBTAPI.query ERROR', paramsKey, e);
-              return _context18.abrupt("return", this._handleError(_context18.t0));
+              return _context21.abrupt("return", this._handleError(_context21.t0));
             case 23:
             case "end":
-              return _context18.stop();
+              return _context21.stop();
           }
-        }, _callee18, this, [[1, 19]]);
+        }, _callee21, this, [[1, 19]]);
       }));
       function query(_x13) {
         return _query.apply(this, arguments);
@@ -954,15 +1178,29 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_processResponseData",
     value: function _processResponseData(response) {
-      var _this3 = this;
+      var _this7 = this;
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       if (response.data.ok === false) {
         return this._handleError(response);
       }
       if (Array.isArray(response.data.items)) {
         //console.log('RBTAPI.query RESPONSE PRE', response.data.items);
+
+        // Ensure WebSocket client is available if realtime is requested
+        var websocketClient = this.websocketClient;
+        if (options.enableRealtime && !websocketClient) {
+          console.log('[AgentProviderSync] Creating WebSocket client for realtime objects');
+          websocketClient = this.getWebSocketClient();
+        }
+        console.log('[AgentProviderSync] _processResponseData creating objects with:', {
+          enableRealtime: options.enableRealtime || false,
+          hasWebSocketClient: !!websocketClient,
+          itemCount: response.data.items.length
+        });
         response.data.items = response.data.items.map(function (record) {
-          return new _rbt_object["default"](record, _this3.axios, {
-            websocketClient: _this3.websocketClient
+          return new _rbt_object["default"](record, _this7.axios, {
+            websocketClient: websocketClient,
+            enableRealtime: options.enableRealtime || false
           });
         });
       }
@@ -982,51 +1220,377 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "load",
     value: (function () {
-      var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(type, ids) {
+      var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(type, ids) {
+        var _this8 = this;
         var params,
           mergedParams,
-          res,
-          _args19 = arguments;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+          cachedObjects,
+          missingIds,
+          _iterator2,
+          _step2,
+          id,
+          _cacheKey,
+          cached,
+          hitLogKey,
+          loadedObjects,
+          bulkMissLogKey,
+          _iterator3,
+          _step3,
+          obj,
+          cacheKey,
+          setLogKey,
+          result,
+          _iterator4,
+          _step4,
+          _id,
+          _cacheKey2,
+          _obj,
+          _cacheKey3,
+          _cached,
+          _hitLogKey,
+          pendingKey,
+          missLogKey,
+          loadPromise,
+          _args23 = arguments;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              params = _args19.length > 2 && _args19[2] !== undefined ? _args19[2] : {};
-              _context19.prev = 1;
+              params = _args23.length > 2 && _args23[2] !== undefined ? _args23[2] : {};
+              if (type == '<@iac.user>') {
+                debugger;
+              }
+              _context23.prev = 2;
               if (!Array.isArray(ids)) {
-                _context19.next = 7;
+                _context23.next = 24;
                 break;
               }
+              // For array requests, check cache for each ID and only load missing ones
+              cachedObjects = [];
+              missingIds = [];
+              _iterator2 = _createForOfIteratorHelper(ids);
+              try {
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  id = _step2.value;
+                  _cacheKey = "".concat(type, ":").concat(id);
+                  cached = this._objectCache.get(_cacheKey);
+                  if (cached) {
+                    // Only log cache hits once per object to reduce spam
+                    hitLogKey = "hit:".concat(_cacheKey);
+                    if (!this._loggedCacheEvents.has(hitLogKey)) {
+                      console.log('[AgentProviderSync] 🎯 roboto.load cache HIT:', {
+                        type: type,
+                        id: id,
+                        hasRealtime: !!cached._realtime,
+                        requestedRealtime: !!params.enableRealtime
+                      });
+                      this._loggedCacheEvents.add(hitLogKey);
+                    }
+
+                    // If realtime is requested but cached object doesn't have it, upgrade it
+                    if (params.enableRealtime && !cached._realtime) {
+                      console.log('[AgentProviderSync] 🔄 Upgrading cached object to realtime:', {
+                        type: type,
+                        id: id
+                      });
+                      cached._initRealtime();
+                    }
+                    cachedObjects.push(cached);
+                  } else {
+                    missingIds.push(id);
+                  }
+                }
+
+                // Load missing objects
+              } catch (err) {
+                _iterator2.e(err);
+              } finally {
+                _iterator2.f();
+              }
+              loadedObjects = [];
+              if (!(missingIds.length > 0)) {
+                _context23.next = 18;
+                break;
+              }
+              // Only log bulk cache miss once
+              bulkMissLogKey = "bulk-miss:".concat(type, ":").concat(missingIds.join(','));
+              if (!this._loggedCacheEvents.has(bulkMissLogKey)) {
+                console.log('[AgentProviderSync] 📦 roboto.load cache MISS, loading:', {
+                  type: type,
+                  ids: missingIds
+                });
+                this._loggedCacheEvents.add(bulkMissLogKey);
+              }
               mergedParams = _objectSpread(_objectSpread({}, params), {}, {
-                where: "id IN (\"".concat(ids.join("\",\""), "\")")
-              });
-              return _context19.abrupt("return", this.query(type, mergedParams));
-            case 7:
-              mergedParams = _objectSpread(_objectSpread({}, params), {}, {
-                where: "id=\"".concat(ids, "\"")
+                where: "id IN (\"".concat(missingIds.join("\",\""), "\")")
               });
-              _context19.next = 10;
+              _context23.next = 15;
               return this.query(type, mergedParams);
-            case 10:
-              res = _context19.sent;
-              return _context19.abrupt("return", res[0]);
-            case 12:
-              _context19.next = 17;
+            case 15:
+              loadedObjects = _context23.sent;
+              // Cache the newly loaded objects
+              _iterator3 = _createForOfIteratorHelper(loadedObjects);
+              try {
+                for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                  obj = _step3.value;
+                  cacheKey = "".concat(type, ":").concat(obj.id);
+                  this._objectCache.set(cacheKey, obj);
+
+                  // Only log cache set once per object to reduce spam
+                  setLogKey = "set:".concat(cacheKey);
+                  if (!this._loggedCacheEvents.has(setLogKey)) {
+                    console.log('[AgentProviderSync] 💾 roboto.load cached object:', {
+                      type: type,
+                      id: obj.id
+                    });
+                    this._loggedCacheEvents.add(setLogKey);
+                  }
+                }
+              } catch (err) {
+                _iterator3.e(err);
+              } finally {
+                _iterator3.f();
+              }
+            case 18:
+              // Return combined results in original order
+              result = [];
+              _iterator4 = _createForOfIteratorHelper(ids);
+              try {
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  _id = _step4.value;
+                  _cacheKey2 = "".concat(type, ":").concat(_id);
+                  _obj = this._objectCache.get(_cacheKey2);
+                  if (_obj) {
+                    // Ensure realtime is enabled if requested
+                    if (params.enableRealtime && !_obj._realtime) {
+                      _obj._initRealtime();
+                    }
+                    result.push(_obj);
+                  }
+                }
+              } catch (err) {
+                _iterator4.e(err);
+              } finally {
+                _iterator4.f();
+              }
+              return _context23.abrupt("return", result);
+            case 24:
+              // For single object requests, check cache first
+              _cacheKey3 = "".concat(type, ":").concat(ids);
+              _cached = this._objectCache.get(_cacheKey3);
+              if (!_cached) {
+                _context23.next = 31;
+                break;
+              }
+              // Only log cache hits once per object to reduce spam
+              _hitLogKey = "hit:".concat(_cacheKey3);
+              if (!this._loggedCacheEvents.has(_hitLogKey) || console.log('[AgentProviderSync] 🎯 roboto.load cache HIT:', {
+                type: type,
+                id: ids,
+                hasRealtime: !!_cached._realtime,
+                requestedRealtime: !!params.enableRealtime
+              })) {
+                this._loggedCacheEvents.add(_hitLogKey);
+              }
+
+              // If realtime is requested but cached object doesn't have it, upgrade it
+              if (params.enableRealtime && !_cached._realtime) {
+                console.log('[AgentProviderSync] 🔄 Upgrading cached object to realtime:', {
+                  type: type,
+                  id: ids
+                });
+                _cached._initRealtime();
+              }
+              return _context23.abrupt("return", _cached);
+            case 31:
+              // Check if we're already loading this object
+              pendingKey = "".concat(type, ":").concat(ids);
+              if (!this._pendingLoads.has(pendingKey)) {
+                _context23.next = 36;
+                break;
+              }
+              _context23.next = 35;
+              return this._pendingLoads.get(pendingKey);
+            case 35:
+              return _context23.abrupt("return", _context23.sent);
+            case 36:
+              // Only log cache miss once per object to reduce spam
+              missLogKey = "miss:".concat(_cacheKey3);
+              if (!this._loggedCacheEvents.has(missLogKey)) {
+                console.log('[AgentProviderSync] 📦 roboto.load cache MISS, loading:', {
+                  type: type,
+                  id: ids
+                });
+                this._loggedCacheEvents.add(missLogKey);
+              }
+
+              // Create the loading promise and store it to prevent duplicate requests
+              loadPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+                var res, _obj2, _setLogKey;
+                return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+                  while (1) switch (_context22.prev = _context22.next) {
+                    case 0:
+                      _context22.prev = 0;
+                      mergedParams = _objectSpread(_objectSpread({}, params), {}, {
+                        where: "id=\"".concat(ids, "\"")
+                      });
+                      _context22.next = 4;
+                      return _this8.query(type, mergedParams);
+                    case 4:
+                      res = _context22.sent;
+                      _obj2 = res[0];
+                      if (_obj2) {
+                        // Cache the loaded object
+                        _this8._objectCache.set(_cacheKey3, _obj2);
+
+                        // Only log cache set once per object to reduce spam
+                        _setLogKey = "set:".concat(_cacheKey3);
+                        if (!_this8._loggedCacheEvents.has(_setLogKey)) {
+                          console.log('[AgentProviderSync] 💾 roboto.load cached object:', {
+                            type: type,
+                            id: ids
+                          });
+                          _this8._loggedCacheEvents.add(_setLogKey);
+                        }
+                      }
+                      return _context22.abrupt("return", _obj2);
+                    case 8:
+                      _context22.prev = 8;
+                      // Remove from pending loads
+                      _this8._pendingLoads["delete"](pendingKey);
+                      return _context22.finish(8);
+                    case 11:
+                    case "end":
+                      return _context22.stop();
+                  }
+                }, _callee22, null, [[0,, 8, 11]]);
+              }))(); // Store the promise so other concurrent requests can await it
+              this._pendingLoads.set(pendingKey, loadPromise);
+              _context23.next = 42;
+              return loadPromise;
+            case 42:
+              return _context23.abrupt("return", _context23.sent);
+            case 43:
+              _context23.next = 48;
               break;
-            case 14:
-              _context19.prev = 14;
-              _context19.t0 = _context19["catch"](1);
-              return _context19.abrupt("return", this._handleError(_context19.t0));
-            case 17:
+            case 45:
+              _context23.prev = 45;
+              _context23.t0 = _context23["catch"](2);
+              return _context23.abrupt("return", this._handleError(_context23.t0));
+            case 48:
             case "end":
-              return _context19.stop();
+              return _context23.stop();
           }
-        }, _callee19, this, [[1, 14]]);
+        }, _callee23, this, [[2, 45]]);
       }));
       function load(_x14, _x15) {
         return _load.apply(this, arguments);
       }
       return load;
     }()
+    /**
+     * Clears the object cache. Useful for cache invalidation.
+     * @param {string} type - Optional object type to clear. If not provided, clears all.
+     * @param {string} id - Optional object ID to clear. If not provided with type, clears all objects of that type.
+     */
+    )
+  }, {
+    key: "clearCache",
+    value: function clearCache() {
+      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+      if (type && id) {
+        // Clear specific object
+        var cacheKey = "".concat(type, ":").concat(id);
+        var removed = this._objectCache["delete"](cacheKey);
+
+        // Clear related log tracking
+        this._loggedCacheEvents["delete"]("hit:".concat(cacheKey));
+        this._loggedCacheEvents["delete"]("miss:".concat(cacheKey));
+        this._loggedCacheEvents["delete"]("set:".concat(cacheKey));
+        console.log('[AgentProviderSync] 🗑️ roboto.clearCache specific object:', {
+          type: type,
+          id: id,
+          removed: removed
+        });
+      } else if (type) {
+        // Clear all objects of a specific type
+        var removedCount = 0;
+        var _iterator5 = _createForOfIteratorHelper(this._objectCache),
+          _step5;
+        try {
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var _step5$value = _slicedToArray(_step5.value, 1),
+              key = _step5$value[0];
+            if (key.startsWith("".concat(type, ":"))) {
+              this._objectCache["delete"](key);
+              removedCount++;
+            }
+          }
+
+          // Clear related log tracking for this type
+        } catch (err) {
+          _iterator5.e(err);
+        } finally {
+          _iterator5.f();
+        }
+        var _iterator6 = _createForOfIteratorHelper(this._loggedCacheEvents),
+          _step6;
+        try {
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            var logKey = _step6.value;
+            if (logKey.includes("".concat(type, ":"))) {
+              this._loggedCacheEvents["delete"](logKey);
+            }
+          }
+        } catch (err) {
+          _iterator6.e(err);
+        } finally {
+          _iterator6.f();
+        }
+        console.log('[AgentProviderSync] 🗑️ roboto.clearCache by type:', {
+          type: type,
+          removedCount: removedCount
+        });
+      } else {
+        // Clear all cached objects
+        var size = this._objectCache.size;
+        this._objectCache.clear();
+        this._loggedCacheEvents.clear();
+        this._pendingLoads.clear();
+        console.log('[AgentProviderSync] 🗑️ roboto.clearCache all objects:', {
+          clearedCount: size
+        });
+      }
+    }
+
+    /**
+     * Gets cache status for debugging
+     * @returns {Object} Cache status information
+     */
+  }, {
+    key: "getCacheStatus",
+    value: function getCacheStatus() {
+      var cacheEntries = Array.from(this._objectCache.entries()).map(function (_ref6) {
+        var _obj$_internalData;
+        var _ref7 = _slicedToArray(_ref6, 2),
+          key = _ref7[0],
+          obj = _ref7[1];
+        return {
+          key: key,
+          id: obj.id,
+          type: ((_obj$_internalData = obj._internalData) === null || _obj$_internalData === void 0 ? void 0 : _obj$_internalData.type) || 'unknown'
+        };
+      });
+      var pendingLoads = Array.from(this._pendingLoads.keys());
+      return {
+        cacheSize: this._objectCache.size,
+        pendingLoads: pendingLoads.length,
+        loggedEvents: this._loggedCacheEvents.size,
+        entries: cacheEntries,
+        pendingKeys: pendingLoads
+      };
+    }
+
     /**
      * Makes a POST request to a specific endpoint to run a task and handle progress updates.
      *
@@ -1045,11 +1609,10 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
      *   status: string // Can be 'RUNNING', 'DONE', or 'ERROR'
      * }
      */
-    )
   }, {
     key: "runTask",
     value: (function () {
-      var _runTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+      var _runTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var params,
           callbacks,
           onProgress,
@@ -1063,20 +1626,20 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
           status,
           message,
           output,
-          _args20 = arguments;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+          _args24 = arguments;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              params = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {};
-              callbacks = _args20.length > 1 && _args20[1] !== undefined ? _args20[1] : {};
+              params = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {};
+              callbacks = _args24.length > 1 && _args24[1] !== undefined ? _args24[1] : {};
               onProgress = callbacks.onProgress, onError = callbacks.onError, onStopped = callbacks.onStopped, onWaiting = callbacks.onWaiting, onDone = callbacks.onDone;
-              _context20.prev = 3;
-              _context20.next = 6;
+              _context24.prev = 3;
+              _context24.next = 6;
               return this.post('/task_service/runChain', params);
             case 6:
-              response = _context20.sent;
+              response = _context24.sent;
               if (response) {
-                _context20.next = 9;
+                _context24.next = 9;
                 break;
               }
               throw new Error('Invalid server response');
@@ -1084,7 +1647,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               // Validate response structure
               ok = response.ok, jobId = response.jobId, status = response.status, message = response.message, output = response.output;
               if (!(!ok || typeof jobId !== 'string' || typeof status !== 'string')) {
-                _context20.next = 12;
+                _context24.next = 12;
                 break;
               }
               throw new Error('Invalid response structure');
@@ -1110,7 +1673,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                 //console.log('Finish (request) ',response);
                 onDone(response);
               }
-              return _context20.abrupt("return", {
+              return _context24.abrupt("return", {
                 ok: ok,
                 jobId: jobId,
                 status: status,
@@ -1118,24 +1681,24 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                 output: output
               });
             case 20:
-              _context20.prev = 20;
-              _context20.t0 = _context20["catch"](3);
+              _context24.prev = 20;
+              _context24.t0 = _context24["catch"](3);
               if (typeof onError === 'function') {
-                onError(_context20.t0);
+                onError(_context24.t0);
               } else {
-                console.error('Error in runTask:', _context20.t0);
+                console.error('Error in runTask:', _context24.t0);
               }
-              return _context20.abrupt("return", {
+              return _context24.abrupt("return", {
                 ok: false,
                 jobId: null,
                 status: 'ERROR',
-                error: _context20.t0.message
+                error: _context24.t0.message
               });
             case 24:
             case "end":
-              return _context20.stop();
+              return _context24.stop();
           }
-        }, _callee20, this, [[3, 20]]);
+        }, _callee24, this, [[3, 20]]);
       }));
       function runTask() {
         return _runTask.apply(this, arguments);
@@ -1145,37 +1708,37 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopJob",
     value: function () {
-      var _stopJob = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      var _stopJob = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var params,
           callbacks,
           response,
-          _args21 = arguments;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+          _args25 = arguments;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              params = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
-              callbacks = _args21.length > 1 && _args21[1] !== undefined ? _args21[1] : {};
-              _context21.prev = 2;
-              _context21.next = 5;
+              params = _args25.length > 0 && _args25[0] !== undefined ? _args25[0] : {};
+              callbacks = _args25.length > 1 && _args25[1] !== undefined ? _args25[1] : {};
+              _context25.prev = 2;
+              _context25.next = 5;
               return this.post('/task_service/stopJob', params);
             case 5:
-              response = _context21.sent;
+              response = _context25.sent;
               if (response) {
-                _context21.next = 8;
+                _context25.next = 8;
                 break;
               }
               throw new Error('Invalid server response');
             case 8:
-              return _context21.abrupt("return", true);
+              return _context25.abrupt("return", true);
             case 11:
-              _context21.prev = 11;
-              _context21.t0 = _context21["catch"](2);
+              _context25.prev = 11;
+              _context25.t0 = _context25["catch"](2);
               throw 'Error in stopJob';
             case 14:
             case "end":
-              return _context21.stop();
+              return _context25.stop();
           }
-        }, _callee21, this, [[2, 11]]);
+        }, _callee25, this, [[2, 11]]);
       }));
       function stopJob() {
         return _stopJob.apply(this, arguments);
@@ -1195,26 +1758,26 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "pollTaskProgress",
     value: (function () {
-      var _pollTaskProgress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(jobId, callbacks) {
-        var _this4 = this;
+      var _pollTaskProgress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(jobId, callbacks) {
+        var _this9 = this;
         var onProgress, onError, onStopped, onWaiting, onDone, _callbacks$pollingInt, pollingInterval, checkProgress;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               onProgress = callbacks.onProgress, onError = callbacks.onError, onStopped = callbacks.onStopped, onWaiting = callbacks.onWaiting, onDone = callbacks.onDone, _callbacks$pollingInt = callbacks.pollingInterval, pollingInterval = _callbacks$pollingInt === void 0 ? 2000 : _callbacks$pollingInt;
-              _context23.prev = 1;
+              _context27.prev = 1;
               checkProgress = /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+                var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
                   var response;
-                  return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-                    while (1) switch (_context22.prev = _context22.next) {
+                  return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+                    while (1) switch (_context26.prev = _context26.next) {
                       case 0:
-                        _context22.next = 2;
-                        return _this4.get("/task_service/pollChainProgress", {
+                        _context26.next = 2;
+                        return _this9.get("/task_service/pollChainProgress", {
                           jobId: jobId
                         });
                       case 2:
-                        response = _context22.sent;
+                        response = _context26.sent;
                         // If the task is still in progress, start polling for updates
                         if (response.status === 'DONE' && onDone) {
                           // Provide the current progress to the callback function
@@ -1245,26 +1808,26 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
                         }
                       case 9:
                       case "end":
-                        return _context22.stop();
+                        return _context26.stop();
                     }
-                  }, _callee22);
+                  }, _callee26);
                 }));
                 return function checkProgress() {
-                  return _ref2.apply(this, arguments);
+                  return _ref8.apply(this, arguments);
                 };
               }();
               checkProgress();
-              _context23.next = 9;
+              _context27.next = 9;
               break;
             case 6:
-              _context23.prev = 6;
-              _context23.t0 = _context23["catch"](1);
-              return _context23.abrupt("return", this._handleError(_context23.t0));
+              _context27.prev = 6;
+              _context27.t0 = _context27["catch"](1);
+              return _context27.abrupt("return", this._handleError(_context27.t0));
             case 9:
             case "end":
-              return _context23.stop();
+              return _context27.stop();
           }
-        }, _callee23, this, [[1, 6]]);
+        }, _callee27, this, [[1, 6]]);
       }));
       function pollTaskProgress(_x16, _x17) {
         return _pollTaskProgress.apply(this, arguments);
@@ -1286,43 +1849,43 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: (function () {
-      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(endpoint) {
+      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(endpoint) {
         var params,
           headers,
           response,
-          _args24 = arguments;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+          _args28 = arguments;
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              params = _args24.length > 1 && _args24[1] !== undefined ? _args24[1] : {};
-              _context24.prev = 1;
+              params = _args28.length > 1 && _args28[1] !== undefined ? _args28[1] : {};
+              _context28.prev = 1;
               // Add the authToken to the headers
               headers = {
                 authtoken: this.authtoken
               }; // Make the GET request using Axios
-              _context24.next = 5;
+              _context28.next = 5;
               return this.axios.get(endpoint, {
                 params: params,
                 headers: headers
               });
             case 5:
-              response = _context24.sent;
+              response = _context28.sent;
               if (!(response.data.ok === false)) {
-                _context24.next = 8;
+                _context28.next = 8;
                 break;
               }
-              return _context24.abrupt("return", this._handleError(response));
+              return _context28.abrupt("return", this._handleError(response));
             case 8:
-              return _context24.abrupt("return", response.data);
+              return _context28.abrupt("return", response.data);
             case 11:
-              _context24.prev = 11;
-              _context24.t0 = _context24["catch"](1);
-              return _context24.abrupt("return", this._handleError(_context24.t0));
+              _context28.prev = 11;
+              _context28.t0 = _context28["catch"](1);
+              return _context28.abrupt("return", this._handleError(_context28.t0));
             case 14:
             case "end":
-              return _context24.stop();
+              return _context28.stop();
           }
-        }, _callee24, this, [[1, 11]]);
+        }, _callee28, this, [[1, 11]]);
       }));
       function get(_x18) {
         return _get.apply(this, arguments);
@@ -1345,42 +1908,42 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "post",
     value: (function () {
-      var _post = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(endpoint) {
+      var _post = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(endpoint) {
         var data,
           headers,
           response,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args29 = arguments;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              data = _args25.length > 1 && _args25[1] !== undefined ? _args25[1] : {};
-              _context25.prev = 1;
+              data = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : {};
+              _context29.prev = 1;
               // Add the authToken to the headers
               headers = {
                 authtoken: this.authtoken
               }; // Make the POST request using Axios
-              _context25.next = 5;
+              _context29.next = 5;
               return this.axios.post(endpoint, data, {
                 headers: headers
               });
             case 5:
-              response = _context25.sent;
+              response = _context29.sent;
               if (!(response.data.ok === false)) {
-                _context25.next = 8;
+                _context29.next = 8;
                 break;
               }
-              return _context25.abrupt("return", this._handleError(response));
+              return _context29.abrupt("return", this._handleError(response));
             case 8:
-              return _context25.abrupt("return", response.data);
+              return _context29.abrupt("return", response.data);
             case 11:
-              _context25.prev = 11;
-              _context25.t0 = _context25["catch"](1);
-              return _context25.abrupt("return", this._handleError(_context25.t0));
+              _context29.prev = 11;
+              _context29.t0 = _context29["catch"](1);
+              return _context29.abrupt("return", this._handleError(_context29.t0));
             case 14:
             case "end":
-              return _context25.stop();
+              return _context29.stop();
           }
-        }, _callee25, this, [[1, 11]]);
+        }, _callee29, this, [[1, 11]]);
       }));
       function post(_x19) {
         return _post.apply(this, arguments);