roboto-js 1.8.4 → 1.8.6

package/dist/rbt_user.js

@@ -0,0 +1,235 @@
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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 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(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _ from 'lodash';
+var RbtUser = /*#__PURE__*/function () {
+  function RbtUser(record, axiosInstance) {
+    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    _classCallCheck(this, RbtUser);
+    this._axios = axiosInstance;
+    this._internalData = record;
+    this.id = record.id;
+    this.id_revision = record.id_revision;
+    this.rpcMeta = {
+      changes: [],
+      isNew: options.isNew || false
+    };
+    if (record.data) {
+      this._data = this._deepUnpackJson(record.data);
+    } else {
+      this._data = record.dataJson ? this._deepUnpackJson(record.dataJson) : {};
+    }
+  }
+  return _createClass(RbtUser, [{
+    key: "get",
+    value: function get(path) {
+      return _.get(this._data, path);
+    }
+  }, {
+    key: "getData",
+    value: function getData() {
+      return _objectSpread({}, this._data);
+    }
+  }, {
+    key: "_addChange",
+    value: function _addChange(path) {
+      // Ensure no duplicate paths
+      if (!this.rpcMeta.changes.includes(path)) {
+        this.rpcMeta.changes.push(path);
+      }
+    }
+  }, {
+    key: "set",
+    value: function set(path, value) {
+      var currentValue = _.get(this._data, path);
+      if (!_.isEqual(currentValue, value)) {
+        _.set(this._data, path, value);
+        this._addChange(path);
+      }
+    }
+  }, {
+    key: "setData",
+    value: function setData(newData) {
+      var _this = this;
+      if (_typeof(newData) !== 'object' || newData === null) {
+        throw new Error('setData expects an object');
+      }
+      Object.keys(newData).forEach(function (key) {
+        if (!_.isEqual(_.get(_this._data, key), newData[key])) {
+          _.set(_this._data, key, newData[key]);
+          _this._addChange(key);
+        }
+      });
+    }
+
+    //
+    // For Arrays
+    //
+  }, {
+    key: "setAppend",
+    value: function setAppend(key, value) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var existingValue = this.get(key) || []; // Get the existing value or default to an empty array
+      if (!Array.isArray(existingValue)) {
+        existingValue = []; // Ensure existingValue is an array if not already
+      }
+      var valuesToAdd = Array.isArray(value) ? value : [value]; // Convert value to an array if it's not one
+
+      // Combine existingValue and valuesToAdd, filtering out duplicates
+      var mergedValues = Array.from(new Set([].concat(_toConsumableArray(existingValue), _toConsumableArray(valuesToAdd))));
+      this.set(key, mergedValues, options); // Set the updated array back to the user data
+    }
+  }, {
+    key: "setRemove",
+    value: function setRemove(key, value) {
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var existingValue = this.get(key) || []; // Get the existing value or default to an empty array
+      if (!Array.isArray(existingValue)) {
+        return; // If it's not an array, there's nothing to remove, so exit early
+      }
+      var valuesToRemove = Array.isArray(value) ? value : [value]; // Convert value to an array if it's not one
+
+      // Filter out the values to remove from the existing value array
+      var filteredValues = existingValue.filter(function (item) {
+        return !valuesToRemove.includes(item);
+      });
+      this.set(key, filteredValues); // Set the updated array back to the user data
+    }
+
+    //
+    //
+    //
+  }, {
+    key: "toRecord",
+    value: function toRecord() {
+      return _objectSpread(_objectSpread({}, this._internalData), {}, {
+        dataJson: JSON.stringify(this._data),
+        rpcMeta: this.rpcMeta
+      });
+    }
+  }, {
+    key: "clone",
+    value: function clone() {
+      // Create a deep copy of the current object's data
+      var clonedData = _.cloneDeep(this._internalData);
+
+      // Reset unique identifiers to ensure a new ID is generated upon saving
+      delete clonedData.id;
+      delete clonedData.id_revision;
+
+      // Create a new instance of RbtUser with the cloned data
+      var clonedObject = new RbtUser(clonedData, this._axios, {
+        isNew: true
+      });
+      return clonedObject;
+    }
+  }, {
+    key: "save",
+    value: function () {
+      var _save = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+        var record, response, _t;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.p = _context.n) {
+            case 0:
+              _context.p = 0;
+              debugger;
+              record = this.toRecord();
+              record.type = '<@iac.user>';
+              _context.n = 1;
+              return this._axios.post('/user_service/saveUser', [record]);
+            case 1:
+              response = _context.v;
+              if (!(response.data.ok === false)) {
+                _context.n = 2;
+                break;
+              }
+              throw new Error(response.data.message);
+            case 2:
+              this._internalData = response.data;
+              this.id = response.data.id;
+              this.id_revision = response.data.id_revision;
+              this.type = response.data.type;
+              this.rpcMeta.isNew = false;
+              return _context.a(2, this);
+            case 3:
+              _context.p = 3;
+              _t = _context.v;
+              console.log('RbtUser.save.error:', _t);
+              //console.log(e.response.data);
+              throw _t;
+            case 4:
+              return _context.a(2);
+          }
+        }, _callee, this, [[0, 3]]);
+      }));
+      function save() {
+        return _save.apply(this, arguments);
+      }
+      return save;
+    }()
+  }, {
+    key: "_deepUnpackJson",
+    value: function _deepUnpackJson(value) {
+      if (typeof value === 'string') {
+        try {
+          // Only parse as JSON if it's not a large number
+          // https://chatgpt.com/c/6745902c-edf4-800c-ab52-31bf27dde2bd
+          // 
+          if (!/^\d{16,}$/.test(value)) {
+            var parsed = JSON.parse(value);
+            // Recursively parse if the result is a string, object, or array
+            return this._deepUnpackJson(parsed);
+          }
+        } catch (e) {
+          return value; // Return the original string if parsing fails
+        }
+      } else if (value !== null && _typeof(value) === 'object') {
+        // If it's an object (including arrays), recursively parse each value
+        for (var key in value) {
+          value[key] = this._deepUnpackJson(value[key]);
+        }
+      }
+      return value;
+    }
+
+    //async delete() {
+    //  if (!this._internalData.type) {
+    //    throw new Error('Cannot delete object without type');
+    //  }
+    //
+    //  try {
+    //    const record = this.toRecord();
+    //    const response = await this._axios.post('/object_service/deleteObject', [record]);
+    //
+    //    if (response.data.ok === false) {
+    //      throw new Error(response.data.message);
+    //    }
+    //    
+    //    this._internalData = response.data;
+    //    return this;
+    //
+    //  } catch (e) {
+    //    console.log('RbtUser.delete.error:');
+    //    console.log(e.response.data);
+    //    throw e;
+    //  }
+    //}
+  }]);
+}();
+export { RbtUser as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",
@@ -11,7 +11,7 @@
   "scripts": {
     "clean": "rm -rf node_modules; rm package-lock.json; npm install",
     "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "babel src --out-dir dist/cjs --presets=@babel/preset-env --extensions \".js,.jsx\" --out-file-extension .cjs && npm run postbuild:cjs",
+    "build:cjs": "babel src --out-dir dist/cjs --extensions \".js,.jsx\" --out-file-extension .cjs && npm run postbuild:cjs",
     "build:esm": "babel src --out-dir dist/esm",
     "xbuild:esm": "babel src --out-dir dist/esm --presets=@babel/preset-env --no-babelrc --config-file ./babel.esm.config.json",
     "postbuild:cjs": "node postbuild-cjs.js",
@@ -32,6 +32,7 @@
   "devDependencies": {
     "@babel/cli": "^7.23.9",
     "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.9"
+    "@babel/preset-env": "^7.23.9",
+    "babel-plugin-transform-remove-console": "^6.9.4"
   }
 }

package/src/index.js

@@ -20,8 +20,10 @@ export default class Roboto{
     return '1.7.3';
   }
 
-  constructor({ host, accessKey, localStorageAdaptor, disableWebSocket = false, metricsHost, useCookies = true }, proxyReq = null) {
+  constructor({ host, accessKey, apiKey, authToken, localStorageAdaptor, disableWebSocket = false, metricsHost, useCookies = true }, proxyReq = null) {
 
+    console.log('[Roboto] constructor', { host, accessKey, apiKey, authToken, localStorageAdaptor, disableWebSocket, metricsHost, useCookies, proxyReq });
+    
     if (Roboto.instance && !proxyReq) {
       // if on client, there can only be one instance
       // on server, with proxyReq, each request has its own instance
@@ -51,28 +53,36 @@ export default class Roboto{
     }
     
     this.config = {
-      accessKey: accessKey, // Use passed accessKey
+      accesskey: accessKey, // Use passed accessKey
       baseUrl: `https://${host}`, // Use passed host
       localStorageAdaptor: storageAdaptor
     };
+    
+    // Add apikey and authtoken if provided directly
+    if (apiKey) {
+      this.config.apikey = apiKey;
+    }
+    if (authToken) {
+      this.config.authtoken = authToken;
+    }
 
     // DEVELOPMENT
     this.config.baseUrl = this._stripHttpsForDomains(this.config.baseUrl, ['localhost']);
 
     // Check if a request object is provided
     if (proxyReq && proxyReq.headers) {
-      const authtoken = proxyReq.headers.authtoken;
-      const accesskey = proxyReq.headers.accesskey;
-      const apikey = proxyReq.headers.apikey;
+      const header_authtoken = proxyReq.headers.authtoken;
+      const header_accesskey = proxyReq.headers.accesskey;
+      const header_apikey = proxyReq.headers.apikey;
       // Optionally add more headers as needed
-      if (authtoken) {
-        this.config.authtoken = authtoken; // Set the authtoken in the config
+      if (header_authtoken) {
+        this.config.authtoken = header_authtoken; // Set the authtoken in the config
       }
-      if (apikey) {
-        this.config.apikey = apikey; // Set the authtoken in the config
+      if (header_apikey) {
+        this.config.apikey = header_apikey; // Set the authtoken in the config
       }
-      if (accesskey) {
-        this.config.accesskey = accesskey; // Set the accesskey in the config
+      if (header_accesskey) {
+        this.config.accesskey = header_accesskey; // Set the accesskey in the config
       }
 
     }

package/src/rbt_api.js

@@ -10,6 +10,8 @@ export default class RbtApi {
 
   constructor({ baseUrl, accesskey, authtoken=null, apikey=null, localStorageAdaptor=null }) {
     
+    console.log('[RbtApi] constructor received:', { baseUrl, accesskey, authtoken, apikey });
+    
     this.websocketClient = null;
 
     // Object cache for sharing instances across multiple load() calls
@@ -55,6 +57,13 @@ export default class RbtApi {
 
     // Use the storageAdaptor to get the authToken, if available
     this.initAuthToken(authtoken);
+    
+    // Set apiKey synchronously if provided (don't wait for async initApiKey)
+    if (apikey) {
+      this.apikey = apikey;
+      this.axios.defaults.headers.common['apikey'] = this.apikey;
+      console.log('[RbtApi] Set apikey header:', this.axios.defaults.headers.common['apikey']);  // ADD THIS LINE
+    }
     this.initApiKey(apikey);