ironflock 1.2.2 → 1.2.4

package/dist/index.mjs

@@ -1,10 +1,10 @@
-import T from "autobahn";
+import C from "autobahn";
 function P(d) {
   return d && d.__esModule && Object.prototype.hasOwnProperty.call(d, "default") ? d.default : d;
 }
-var S = { exports: {} }, C;
+var I = { exports: {} }, N;
 function L() {
-  return C || (C = 1, (function(d) {
+  return N || (N = 1, (function(d) {
     var r = Object.prototype.hasOwnProperty, s = "~";
     function o() {
     }
@@ -15,8 +15,8 @@ function L() {
     function i(a, e, n, c, f) {
       if (typeof n != "function")
         throw new TypeError("The listener must be a function");
-      var v = new l(n, c || a, f), m = s ? s + e : e;
-      return a._events[m] ? a._events[m].fn ? a._events[m] = [a._events[m], v] : a._events[m].push(v) : (a._events[m] = v, a._eventsCount++), a;
+      var v = new l(n, c || a, f), g = s ? s + e : e;
+      return a._events[g] ? a._events[g].fn ? a._events[g] = [a._events[g], v] : a._events[g].push(v) : (a._events[g] = v, a._eventsCount++), a;
     }
     function u(a, e) {
       --a._eventsCount === 0 ? a._events = new o() : delete a._events[e];
@@ -34,16 +34,16 @@ function L() {
       var n = s ? s + e : e, c = this._events[n];
       if (!c) return [];
       if (c.fn) return [c.fn];
-      for (var f = 0, v = c.length, m = new Array(v); f < v; f++)
-        m[f] = c[f].fn;
-      return m;
+      for (var f = 0, v = c.length, g = new Array(v); f < v; f++)
+        g[f] = c[f].fn;
+      return g;
     }, t.prototype.listenerCount = function(e) {
       var n = s ? s + e : e, c = this._events[n];
       return c ? c.fn ? 1 : c.length : 0;
-    }, t.prototype.emit = function(e, n, c, f, v, m) {
+    }, t.prototype.emit = function(e, n, c, f, v, g) {
       var w = s ? s + e : e;
       if (!this._events[w]) return !1;
-      var h = this._events[w], b = arguments.length, _, g;
+      var h = this._events[w], b = arguments.length, _, y;
       if (h.fn) {
         switch (h.once && this.removeListener(e, h.fn, void 0, !0), b) {
           case 1:
@@ -57,31 +57,31 @@ function L() {
           case 5:
             return h.fn.call(h.context, n, c, f, v), !0;
           case 6:
-            return h.fn.call(h.context, n, c, f, v, m), !0;
+            return h.fn.call(h.context, n, c, f, v, g), !0;
         }
-        for (g = 1, _ = new Array(b - 1); g < b; g++)
-          _[g - 1] = arguments[g];
+        for (y = 1, _ = new Array(b - 1); y < b; y++)
+          _[y - 1] = arguments[y];
         h.fn.apply(h.context, _);
       } else {
         var j = h.length, A;
-        for (g = 0; g < j; g++)
-          switch (h[g].once && this.removeListener(e, h[g].fn, void 0, !0), b) {
+        for (y = 0; y < j; y++)
+          switch (h[y].once && this.removeListener(e, h[y].fn, void 0, !0), b) {
             case 1:
-              h[g].fn.call(h[g].context);
+              h[y].fn.call(h[y].context);
               break;
             case 2:
-              h[g].fn.call(h[g].context, n);
+              h[y].fn.call(h[y].context, n);
               break;
             case 3:
-              h[g].fn.call(h[g].context, n, c);
+              h[y].fn.call(h[y].context, n, c);
               break;
             case 4:
-              h[g].fn.call(h[g].context, n, c, f);
+              h[y].fn.call(h[y].context, n, c, f);
               break;
             default:
               if (!_) for (A = 1, _ = new Array(b - 1); A < b; A++)
                 _[A - 1] = arguments[A];
-              h[g].fn.apply(h[g].context, _);
+              h[y].fn.apply(h[y].context, _);
           }
       }
       return !0;
@@ -94,12 +94,12 @@ function L() {
       if (!this._events[v]) return this;
       if (!n)
         return u(this, v), this;
-      var m = this._events[v];
-      if (m.fn)
-        m.fn === n && (!f || m.once) && (!c || m.context === c) && u(this, v);
+      var g = this._events[v];
+      if (g.fn)
+        g.fn === n && (!f || g.once) && (!c || g.context === c) && u(this, v);
       else {
-        for (var w = 0, h = [], b = m.length; w < b; w++)
-          (m[w].fn !== n || f && !m[w].once || c && m[w].context !== c) && h.push(m[w]);
+        for (var w = 0, h = [], b = g.length; w < b; w++)
+          (g[w].fn !== n || f && !g[w].once || c && g[w].context !== c) && h.push(g[w]);
         h.length ? this._events[v] = h.length === 1 ? h[0] : h : u(this, v);
       }
       return this;
@@ -107,26 +107,26 @@ function L() {
       var n;
       return e ? (n = s ? s + e : e, this._events[n] && u(this, n)) : (this._events = new o(), this._eventsCount = 0), this;
     }, t.prototype.off = t.prototype.removeListener, t.prototype.addListener = t.prototype.on, t.prefixed = s, t.EventEmitter = t, d.exports = t;
-  })(S)), S.exports;
+  })(I)), I.exports;
 }
-var U = L();
-const D = /* @__PURE__ */ P(U), W = "wss://cbw.datapods.io/ws-ua-usr", I = "wss://cbw.ironflock.com/ws-ua-usr", F = "wss://cbw.ironflock.dev/ws-ua-usr", V = "wss://cbw.record-evolution.com/ws-ua-usr", $ = "ws://localhost:8080/ws-ua-usr", Y = {
-  "https://studio.datapods.io": W,
-  "https://studio.ironflock.dev": F,
-  "https://studio.ironflock.com": I,
+var D = L();
+const U = /* @__PURE__ */ P(D), F = "wss://cbw.datapods.io/ws-ua-usr", $ = "wss://cbw.ironflock.com/ws-ua-usr", W = "wss://cbw.ironflock.dev/ws-ua-usr", V = "wss://cbw.record-evolution.com/ws-ua-usr", S = "ws://localhost:8080/ws-ua-usr", Y = {
+  "https://studio.datapods.io": F,
+  "https://studio.ironflock.dev": W,
+  "https://studio.ironflock.com": $,
   "https://studio.record-evolution.com": V,
-  "http://localhost:8085": $,
-  "http://localhost:8086": $,
-  "http://host.docker.internal:8086": $
+  "http://localhost:8085": S,
+  "http://localhost:8086": S,
+  "http://host.docker.internal:8086": S
 }, Q = 6e3;
-class x extends D {
+class x extends U {
   constructor() {
     super(), this.subscriptions = [], this.registrations = [], this.firstResolver = () => {
     }, this.firstRejecter = () => {
     };
   }
   static getWebSocketURI(r) {
-    return r ? Y[r] ?? I : I;
+    return r ? Y[r] ?? $ : $;
   }
   configure(r, s, o, l, i) {
     this.realm = `realm-${r}-${s}-${o}`, this.serial_number = l, this.socketURI = i ?? x.getWebSocketURI();
@@ -136,7 +136,7 @@ class x extends D {
       throw new Error("CrossbarConnection must be configured before starting. Call configure() first.");
     return this.firstConnection = new Promise((r, s) => {
       this.firstResolver = r, this.firstRejecter = s;
-    }), this.connection = new T.Connection({
+    }), this.connection = new C.Connection({
       realm: this.realm,
       url: this.socketURI,
       authmethods: ["wampcra"],
@@ -147,7 +147,7 @@ class x extends D {
       // @ts-ignore
       autoping_interval: 2,
       autoping_timeout: 4,
-      onchallenge: (r, s, o) => T.auth_cra.sign(this.serial_number, o.challenge)
+      onchallenge: (r, s, o) => C.auth_cra.sign(this.serial_number, o.challenge)
     }), this.connection.onopen = this.onOpen.bind(this), this.connection.onclose = this.onClose.bind(this), this.connection.open(), this.firstConnection;
   }
   onOpen(r) {
@@ -216,11 +216,11 @@ class x extends D {
       r.map((s) => this.subscribe(s.topic, s.handler))
     );
   }
-  async register(r, s) {
-    var l;
+  async register(r, s, o) {
+    var u;
     await this.sessionWait();
-    const o = await ((l = this.session) == null ? void 0 : l.register(r, s));
-    return o && this.registrations.push(o), o;
+    const l = { force_reregister: !0, ...o ?? {} }, i = await ((u = this.session) == null ? void 0 : u.register(r, s, l));
+    return i && this.registrations.push(i), i;
   }
   async unregister(r) {
     var o;
@@ -237,7 +237,7 @@ class x extends D {
     return await this.sessionWait(), (i = this.session) == null ? void 0 : i.publish(r, s, o, l);
   }
 }
-const R = (d) => Math.floor(d) === d && B <= d && d <= J, B = 0, J = 2 ** 32 - 1, K = (d) => q.test(d), q = /^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(T|\s)([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:\.[0-9]{1,9})?(Z|[+-]([01][0-9]|2[0-3]):[0-5][0-9])$/i, k = (d) => {
+const K = (d) => Math.floor(d) === d && B <= d && d <= J, B = 0, J = 2 ** 32 - 1, R = (d) => q.test(d), q = /^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])(T|\s)([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:\.[0-9]{1,9})?(Z|[+-]([01][0-9]|2[0-3]):[0-5][0-9])$/i, k = (d) => {
   const r = (s) => {
     if (d.length === 0)
       return !0;
@@ -267,43 +267,43 @@ const R = (d) => Math.floor(d) === d && B <= d && d <= J, B = 0, J = 2 ** 32 - 1
     }
   }
 });
-var y;
+var m;
 (function(d) {
   d[d.Start = 0] = "Start", d[d.Property = 1] = "Property", d[d.StringKey = 2] = "StringKey", d[d.NumberKey = 3] = "NumberKey";
-})(y || (y = {}));
+})(m || (m = {}));
 const H = (d) => {
   if (!d.startsWith("$input"))
     throw new Error(`Invalid path: ${JSON.stringify(d)}`);
   const r = [];
-  let s = "", o = y.Start, l = 5;
+  let s = "", o = m.Start, l = 5;
   for (; l < d.length - 1; ) {
     l++;
     const i = d[l];
-    if (o === y.Property ? i === "." || i === "[" ? (r.push({
+    if (o === m.Property ? i === "." || i === "[" ? (r.push({
       key: s
-    }), o = y.Start) : l === d.length - 1 ? (s += i, r.push({
+    }), o = m.Start) : l === d.length - 1 ? (s += i, r.push({
       key: s
-    }), l++, o = y.Start) : s += i : o === y.StringKey ? i === '"' ? (r.push({
+    }), l++, o = m.Start) : s += i : o === m.StringKey ? i === '"' ? (r.push({
       key: JSON.parse(s + i)
-    }), l += 2, o = y.Start) : i === "\\" ? (s += d[l], l++, s += d[l]) : s += i : o === y.NumberKey && (i === "]" ? (r.push({
+    }), l += 2, o = m.Start) : i === "\\" ? (s += d[l], l++, s += d[l]) : s += i : o === m.NumberKey && (i === "]" ? (r.push({
       key: Number.parseInt(s)
-    }), l++, o = y.Start) : s += i), o === y.Start && l < d.length - 1) {
+    }), l++, o = m.Start) : s += i), o === m.Start && l < d.length - 1) {
       const u = d[l];
       if (s = "", u === "[")
-        d[l + 1] === '"' ? (o = y.StringKey, l++, s = '"') : o = y.NumberKey;
+        d[l + 1] === '"' ? (o = m.StringKey, l++, s = '"') : o = m.NumberKey;
       else if (u === ".")
-        o = y.Property;
+        o = m.Property;
       else
         throw new Error("Unreachable: pointer points invalid character");
     }
   }
-  if (o !== y.Start)
+  if (o !== m.Start)
     throw new Error(`Failed to parse path: ${JSON.stringify(d)}`);
   return r;
 };
 var M = /* @__PURE__ */ ((d) => (d.DEVELOPMENT = "dev", d.PRODUCTION = "prod", d))(M || {});
 const G = (() => {
-  const d = (e) => typeof e.limit == "number" && R(e.limit) && 1 <= e.limit && e.limit <= 1e4 && (e.offset === void 0 || typeof e.offset == "number" && R(e.offset) && 0 <= e.offset) && (e.timeRange === void 0 || typeof e.timeRange == "object" && e.timeRange !== null && r(e.timeRange)) && (e.filterAnd === void 0 || Array.isArray(e.filterAnd) && e.filterAnd.every((n) => typeof n == "object" && n !== null && s(n))), r = (e) => typeof e.start == "string" && K(e.start) && typeof e.end == "string" && K(e.end), s = (e) => typeof e.column == "string" && 1 <= e.column.length && typeof e.operator == "string" && 1 <= e.operator.length && e.value !== null && e.value !== void 0 && (typeof e.value == "string" || typeof e.value == "number" || typeof e.value == "boolean" || Array.isArray(e.value) && e.value.every((n) => typeof n == "string" || typeof n == "number")), o = (e, n, c = !0) => [typeof e.limit == "number" && (R(e.limit) || a(c, {
+  const d = (e) => typeof e.limit == "number" && K(e.limit) && 1 <= e.limit && e.limit <= 1e4 && (e.offset === void 0 || typeof e.offset == "number" && K(e.offset) && 0 <= e.offset) && (e.timeRange === void 0 || typeof e.timeRange == "object" && e.timeRange !== null && r(e.timeRange)) && (e.filterAnd === void 0 || Array.isArray(e.filterAnd) && e.filterAnd.every((n) => typeof n == "object" && n !== null && s(n))), r = (e) => typeof e.start == "string" && R(e.start) && typeof e.end == "string" && R(e.end), s = (e) => typeof e.column == "string" && 1 <= e.column.length && typeof e.operator == "string" && 1 <= e.operator.length && e.value !== null && e.value !== void 0 && (typeof e.value == "string" || typeof e.value == "number" || typeof e.value == "boolean" || Array.isArray(e.value) && e.value.every((n) => typeof n == "string" || typeof n == "number")), o = (e, n, c = !0) => [typeof e.limit == "number" && (K(e.limit) || a(c, {
     path: n + ".limit",
     expected: 'number & Type<"uint32">',
     value: e.limit
@@ -319,7 +319,7 @@ const G = (() => {
     path: n + ".limit",
     expected: '(number & Type<"uint32"> & Minimum<1> & Maximum<10000>)',
     value: e.limit
-  }), e.offset === void 0 || typeof e.offset == "number" && (R(e.offset) || a(c, {
+  }), e.offset === void 0 || typeof e.offset == "number" && (K(e.offset) || a(c, {
     path: n + ".offset",
     expected: 'number & Type<"uint32">',
     value: e.offset
@@ -355,7 +355,7 @@ const G = (() => {
     path: n + ".filterAnd",
     expected: "(Array<SQLFilterAnd> | undefined)",
     value: e.filterAnd
-  })].every((f) => f), l = (e, n, c = !0) => [typeof e.start == "string" && (K(e.start) || a(c, {
+  })].every((f) => f), l = (e, n, c = !0) => [typeof e.start == "string" && (R(e.start) || a(c, {
     path: n + ".start",
     expected: 'string & Format<"date-time">',
     value: e.start
@@ -363,7 +363,7 @@ const G = (() => {
     path: n + ".start",
     expected: '(string & Format<"date-time">)',
     value: e.start
-  }), typeof e.end == "string" && (K(e.end) || a(c, {
+  }), typeof e.end == "string" && (R(e.end) || a(c, {
     path: n + ".end",
     expected: 'string & Format<"date-time">',
     value: e.end
@@ -537,7 +537,7 @@ const G = (() => {
       data: t
     };
   });
-})(), z = (() => {
+})(), te = (() => {
   const d = (t) => typeof t.deviceKey == "string" && 1 <= t.deviceKey.length && typeof t.topic == "string" && 1 <= t.topic.length && (t.args === void 0 || Array.isArray(t.args)) && (t.kwargs === void 0 || typeof t.kwargs == "object" && t.kwargs !== null && Array.isArray(t.kwargs) === !1 && r(t.kwargs)), r = (t) => Object.keys(t).every((a) => (t[a] === void 0, !0)), s = (t, a, e = !0) => [typeof t.deviceKey == "string" && (1 <= t.deviceKey.length || u(e, {
     path: a + ".deviceKey",
     expected: "string & MinLength<1>",
@@ -594,7 +594,7 @@ const G = (() => {
       data: t
     };
   });
-})(), N = (() => {
+})(), T = (() => {
   const d = (t) => typeof t.tablename == "string" && 1 <= t.tablename.length && (t.args === void 0 || Array.isArray(t.args)) && (t.kwargs === void 0 || typeof t.kwargs == "object" && t.kwargs !== null && Array.isArray(t.kwargs) === !1 && r(t.kwargs)), r = (t) => Object.keys(t).every((a) => (t[a] === void 0, !0)), s = (t, a, e = !0) => [typeof t.tablename == "string" && (1 <= t.tablename.length || u(e, {
     path: a + ".tablename",
     expected: "string & MinLength<1>",
@@ -648,7 +648,7 @@ function E(d) {
   var r;
   return typeof process < "u" ? (r = process.env) == null ? void 0 : r[d] : void 0;
 }
-function ee(d) {
+function z(d) {
   const r = d ?? E("DEVICE_SERIAL_NUMBER");
   if (!r)
     throw new Error("serialNumber option is required (or set DEVICE_SERIAL_NUMBER env var in Node.js)");
@@ -656,7 +656,7 @@ function ee(d) {
 }
 class O {
   constructor(r) {
-    this._isConfigured = !1, this._serialNumber = ee(r == null ? void 0 : r.serialNumber), this._deviceName = (r == null ? void 0 : r.deviceName) ?? E("DEVICE_NAME"), this._deviceKey = (r == null ? void 0 : r.deviceKey) ?? E("DEVICE_KEY"), this._appName = (r == null ? void 0 : r.appName) ?? E("APP_NAME"), this._swarmKey = (r == null ? void 0 : r.swarmKey) ?? parseInt(E("SWARM_KEY") ?? "0", 10), this._appKey = (r == null ? void 0 : r.appKey) ?? parseInt(E("APP_KEY") ?? "0", 10), this._env = (r == null ? void 0 : r.env) ?? E("ENV"), this._reswarmUrl = (r == null ? void 0 : r.reswarmUrl) ?? E("RESWARM_URL"), this._cburl = r == null ? void 0 : r.cburl, this._connection = new x();
+    this._isConfigured = !1, this._serialNumber = z(r == null ? void 0 : r.serialNumber), this._deviceName = (r == null ? void 0 : r.deviceName) ?? E("DEVICE_NAME"), this._deviceKey = (r == null ? void 0 : r.deviceKey) ?? E("DEVICE_KEY"), this._appName = (r == null ? void 0 : r.appName) ?? E("APP_NAME"), this._swarmKey = (r == null ? void 0 : r.swarmKey) ?? parseInt(E("SWARM_KEY") ?? "0", 10), this._appKey = (r == null ? void 0 : r.appKey) ?? parseInt(E("APP_KEY") ?? "0", 10), this._env = (r == null ? void 0 : r.env) ?? E("ENV"), this._reswarmUrl = (r == null ? void 0 : r.reswarmUrl) ?? E("RESWARM_URL"), this._cburl = r == null ? void 0 : r.cburl, this._connection = new x();
     const s = [];
     this._deviceKey || s.push("DEVICE_KEY"), this._appName || s.push("APP_NAME"), this._swarmKey || s.push("SWARM_KEY"), this._appKey || s.push("APP_KEY"), s.length > 0 && console.warn(
       `Warning: The following environment variables must be present: ${s.join(", ")}`
@@ -702,7 +702,7 @@ class O {
     });
   }
   async publishToTable(r, s, o) {
-    const l = N({ tablename: r, args: s, kwargs: o });
+    const l = T({ tablename: r, args: s, kwargs: o });
     if (!l.success)
       throw new Error(`Invalid table parameters: ${l.errors.map((u) => u.path + ": " + u.expected).join(", ")}`);
     if (!this._swarmKey) throw new Error("SWARM_KEY not set in environment variables!");
@@ -711,13 +711,17 @@ class O {
     return this.publish(i, s, o);
   }
   async appendToTable(r, s, o) {
-    const l = N({ tablename: r, args: s, kwargs: o });
+    const l = T({ tablename: r, args: s, kwargs: o });
     if (!l.success)
-      throw new Error(`Invalid table parameters: ${l.errors.map((u) => u.path + ": " + u.expected).join(", ")}`);
+      throw new Error(`Invalid table parameters: ${l.errors.map((a) => a.path + ": " + a.expected).join(", ")}`);
     if (!this._swarmKey) throw new Error("SWARM_KEY not set in environment variables!");
     if (!this._appKey) throw new Error("APP_KEY not set in environment variables!");
-    const i = `append.${this._swarmKey}.${this._appKey}.${r}`;
-    return this._connection.call(i, s, o);
+    const i = `append.${this._swarmKey}.${this._appKey}.${r}`, t = { ...{
+      DEVICE_SERIAL_NUMBER: this._serialNumber,
+      DEVICE_KEY: this._deviceKey,
+      DEVICE_NAME: this._deviceName
+    }, ...o ?? {} };
+    return this._connection.call(i, s, t);
   }
   async subscribe(r, s, o) {
     return this._connection.subscribe(r, s);
@@ -728,19 +732,27 @@ class O {
     const l = `${this._swarmKey}.${this._appKey}.${r}`;
     return this.subscribe(l, s, o);
   }
-  async call(r, s, o, l, i) {
-    const u = z({ deviceKey: r, topic: s, args: o, kwargs: l });
-    if (!u.success)
-      throw new Error(`Invalid call parameters: ${u.errors.map((a) => a.path + ": " + a.expected).join(", ")}`);
-    const t = `${r}.${s}`;
-    return this._connection.call(t, o, l, i);
+  async call(r, s, o, l) {
+    return this._connection.call(r, s, o, l);
   }
-  async registerFunction(r, s, o) {
-    const l = `${this._swarmKey}.${this._deviceKey}.${this._appKey}.${this._env}.${r}`, i = await this._connection.register(l, s);
+  async callDeviceFunction(r, s, o, l, i) {
+    const u = `${this._swarmKey}.${r}.${this._appKey}.${this._env}.${s}`;
+    return this._connection.call(u, o, l, i);
+  }
+  /** @deprecated Use callDeviceFunction() instead. */
+  async callFunction(r, s, o, l, i) {
+    return console.warn("callFunction() is deprecated and will be removed in a future version. Use callDeviceFunction() instead."), this.callDeviceFunction(r, s, o, l, i);
+  }
+  async registerDeviceFunction(r, s, o) {
+    const l = `${this._swarmKey}.${this._deviceKey}.${this._appKey}.${this._env}.${r}`, i = await this._connection.register(l, s, o);
     return console.log(`Function registered for IronFlock topic '${r}'. (Full WAMP topic: '${l}')`), i;
   }
+  /** @deprecated Use registerDeviceFunction() instead. */
+  async registerFunction(r, s, o) {
+    return console.warn("registerFunction() is deprecated and will be removed in a future version. Use registerDeviceFunction() instead."), this.registerDeviceFunction(r, s, o);
+  }
   async register(r, s, o) {
-    return this.registerFunction(r, s, o);
+    return this.registerDeviceFunction(r, s, o);
   }
   async getHistory(r, s = { limit: 10 }) {
     if (!r) throw new Error("Tablename must not be empty!");
@@ -799,10 +811,10 @@ export {
   x as CrossbarConnection,
   O as IronFlock,
   M as Stage,
-  z as validateCallParams,
+  te as validateCallParams,
   X as validateLocationParams,
   Z as validatePublishParams,
-  N as validateTableParams,
+  T as validateTableParams,
   G as validateTableQueryParams
 };
 //# sourceMappingURL=index.mjs.map