@auxilium/datalynk-client 0.7.1 → 0.8.0

package/dist/index.cjs

@@ -1,25 +1,24 @@
-(function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.utils = {}));
+(function(global2, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2.utils = {}));
 })(this, function(exports2) {
   "use strict";var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
-  var rt = Object.defineProperty;
-  var nt = (r, t, e) => t in r ? rt(r, t, { enumerable: true, configurable: true, writable: true, value: e }) : r[t] = e;
-  var c = (r, t, e) => (nt(r, typeof t != "symbol" ? t + "" : t, e), e);
-  function ot(r, t = false) {
-    if (r == null)
-      throw new Error("Cannot clean a NULL value");
+  var it = Object.defineProperty;
+  var ct = (r, t, e) => t in r ? it(r, t, { enumerable: true, configurable: true, writable: true, value: e }) : r[t] = e;
+  var c = (r, t, e) => ct(r, typeof t != "symbol" ? t + "" : t, e);
+  function ut(r, t = false) {
+    if (r == null) throw new Error("Cannot clean a NULL value");
     return Array.isArray(r) ? r = r.filter((e) => e != null) : Object.entries(r).forEach(([e, n]) => {
       (t && n === void 0 || !t && n == null) && delete r[e];
     }), r;
   }
-  function St(r) {
+  function $t(r) {
     const t = new FormData();
     return Object.entries(r).forEach(([e, n]) => t.append(e, n)), t;
   }
-  function T(r) {
+  function M(r) {
     try {
       return JSON.parse(r);
     } catch {
@@ -28,10 +27,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   }
   class E extends Promise {
     constructor(e) {
-      super((n, o) => e(
-        (s) => n(s),
-        (s) => o(s),
-        (s) => this.progress = s
+      super((n, s) => e(
+        (o) => n(o),
+        (o) => s(o),
+        (o) => this.progress = o
       ));
       c(this, "listeners", []);
       c(this, "_progress", 0);
@@ -43,18 +42,18 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       e != this._progress && (this._progress = e, this.listeners.forEach((n) => n(e)));
     }
     static from(e) {
-      return e instanceof E ? e : new E((n, o) => e.then((...s) => n(...s)).catch((...s) => o(...s)));
+      return e instanceof E ? e : new E((n, s) => e.then((...o) => n(...o)).catch((...o) => s(...o)));
     }
     from(e) {
       const n = E.from(e);
-      return this.onProgress((o) => n.progress = o), n;
+      return this.onProgress((s) => n.progress = s), n;
     }
     onProgress(e) {
       return this.listeners.push(e), this;
     }
     then(e, n) {
-      const o = super.then(e, n);
-      return this.from(o);
+      const s = super.then(e, n);
+      return this.from(s);
     }
     catch(e) {
       return this.from(super.catch(e));
@@ -63,7 +62,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return this.from(super.finally(e));
     }
   }
-  class v {
+  class _ {
     constructor() {
       c(this, "listeners", {});
     }
@@ -72,17 +71,17 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     static off(t, e) {
       const n = t.toString();
-      this.listeners[n] = (this.listeners[n] || []).filter((o) => o === e);
+      this.listeners[n] = (this.listeners[n] || []).filter((s) => s === e);
     }
     static on(t, e) {
-      var o;
+      var s;
       const n = t.toString();
-      return this.listeners[n] || (this.listeners[n] = []), (o = this.listeners[n]) == null || o.push(e), () => this.off(t, e);
+      return this.listeners[n] || (this.listeners[n] = []), (s = this.listeners[n]) == null || s.push(e), () => this.off(t, e);
     }
     static once(t, e) {
       return new Promise((n) => {
-        const o = this.on(t, (...s) => {
-          n(s.length == 1 ? s[0] : s), e && e(...s), o();
+        const s = this.on(t, (...o) => {
+          n(o.length == 1 ? o[0] : o), e && e(...o), s();
         });
       });
     }
@@ -98,13 +97,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     once(t, e) {
       return new Promise((n) => {
-        const o = this.on(t, (...s) => {
-          n(s.length == 1 ? s[0] : s), e && e(...s), o();
+        const s = this.on(t, (...o) => {
+          n(o.length == 1 ? o[0] : o), e && e(...o), s();
         });
       });
     }
   }
-  c(v, "listeners", {});
+  c(_, "listeners", {});
   class p extends Error {
     constructor(e, n) {
       super(e);
@@ -118,8 +117,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this._code = e;
     }
     static from(e) {
-      const n = Number(e.statusCode) ?? Number(e.code), o = new this(e.message || e.toString());
-      return Object.assign(o, {
+      const n = Number(e.statusCode) ?? Number(e.code), s = new this(e.message || e.toString());
+      return Object.assign(s, {
         stack: e.stack,
         ...e,
         code: n ?? void 0
@@ -133,7 +132,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
   }
   c(p, "code", 500);
-  class Y extends p {
+  class W extends p {
     constructor(t = "Bad Request") {
       super(t);
     }
@@ -141,8 +140,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(Y, "code", 400);
-  class H extends p {
+  c(W, "code", 400);
+  class J extends p {
     constructor(t = "Unauthorized") {
       super(t);
     }
@@ -150,8 +149,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(H, "code", 401);
-  class W extends p {
+  c(J, "code", 401);
+  class z extends p {
     constructor(t = "Payment Required") {
       super(t);
     }
@@ -159,8 +158,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(W, "code", 402);
-  class z extends p {
+  c(z, "code", 402);
+  class K extends p {
     constructor(t = "Forbidden") {
       super(t);
     }
@@ -168,8 +167,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(z, "code", 403);
-  class K extends p {
+  c(K, "code", 403);
+  class Z extends p {
     constructor(t = "Not Found") {
       super(t);
     }
@@ -177,8 +176,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(K, "code", 404);
-  class J extends p {
+  c(Z, "code", 404);
+  class V extends p {
     constructor(t = "Method Not Allowed") {
       super(t);
     }
@@ -186,8 +185,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(J, "code", 405);
-  class Z extends p {
+  c(V, "code", 405);
+  class X extends p {
     constructor(t = "Not Acceptable") {
       super(t);
     }
@@ -195,8 +194,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(Z, "code", 406);
-  class V extends p {
+  c(X, "code", 406);
+  class Q extends p {
     constructor(t = "Internal Server Error") {
       super(t);
     }
@@ -204,8 +203,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(V, "code", 500);
-  class X extends p {
+  c(Q, "code", 500);
+  class tt extends p {
     constructor(t = "Not Implemented") {
       super(t);
     }
@@ -213,8 +212,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(X, "code", 501);
-  class Q extends p {
+  c(tt, "code", 501);
+  class et extends p {
     constructor(t = "Bad Gateway") {
       super(t);
     }
@@ -222,8 +221,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(Q, "code", 502);
-  class _ extends p {
+  c(et, "code", 502);
+  class rt extends p {
     constructor(t = "Service Unavailable") {
       super(t);
     }
@@ -231,8 +230,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(_, "code", 503);
-  class tt extends p {
+  c(rt, "code", 503);
+  class nt extends p {
     constructor(t = "Gateway Timeout") {
       super(t);
     }
@@ -240,35 +239,34 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return t.constructor.code == this.code;
     }
   }
-  c(tt, "code", 504);
-  function kt(r, t) {
-    if (r >= 200 && r < 300)
-      return null;
+  c(nt, "code", 504);
+  function Yt(r, t) {
+    if (r >= 200 && r < 300) return null;
     switch (r) {
       case 400:
-        return new Y(t);
+        return new W(t);
       case 401:
-        return new H(t);
+        return new J(t);
       case 402:
-        return new W(t);
-      case 403:
         return new z(t);
-      case 404:
+      case 403:
         return new K(t);
+      case 404:
+        return new Z(t);
       case 405:
-        return new J(t);
+        return new V(t);
       case 406:
-        return new Z(t);
+        return new X(t);
       case 500:
-        return new V(t);
+        return new Q(t);
       case 501:
-        return new X(t);
+        return new tt(t);
       case 502:
-        return new Q(t);
+        return new et(t);
       case 503:
-        return new _(t);
+        return new rt(t);
       case 504:
-        return new tt(t);
+        return new nt(t);
       default:
         return new p(t, r);
     }
@@ -293,60 +291,58 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       };
     }
     request(t = {}) {
-      var o;
-      if (!this.url && !t.url)
-        throw new Error("URL needs to be set");
-      let e = ((o = t.url) != null && o.startsWith("http") ? t.url : (this.url || "") + (t.url || "")).replace(/([^:]\/)\/+/g, "$1");
-      if (t.fragment && (e.includes("#") ? e.replace(/#.*(\?|\n)/g, (s, i) => `#${t.fragment}${i}`) : e += "#" + t.fragment), t.query) {
-        const s = Array.isArray(t.query) ? t.query : Object.keys(t.query).map((i) => ({ key: i, value: t.query[i] }));
-        e += (e.includes("?") ? "&" : "?") + s.map((i) => `${i.key}=${i.value}`).join("&");
+      var s;
+      if (!this.url && !t.url) throw new Error("URL needs to be set");
+      let e = ((s = t.url) != null && s.startsWith("http") ? t.url : (this.url || "") + (t.url || "")).replace(/([^:]\/)\/+/g, "$1");
+      if (t.fragment && (e.includes("#") ? e.replace(/#.*(\?|\n)/g, (o, i) => `#${t.fragment}${i}`) : e += "#" + t.fragment), t.query) {
+        const o = Array.isArray(t.query) ? t.query : Object.keys(t.query).map((i) => ({ key: i, value: t.query[i] }));
+        e += (e.includes("?") ? "&" : "?") + o.map((i) => `${i.key}=${i.value}`).join("&");
       }
-      const n = ot({
+      const n = ut({
         "Content-Type": t.body ? t.body instanceof FormData ? "multipart/form-data" : "application/json" : void 0,
         ...w2.headers,
         ...this.headers,
         ...t.headers
       });
-      return typeof t.body == "object" && t.body != null && n["Content-Type"] == "application/json" && (t.body = JSON.stringify(t.body)), new E((s, i, y) => {
+      return typeof t.body == "object" && t.body != null && n["Content-Type"] == "application/json" && (t.body = JSON.stringify(t.body)), new E((o, i, a) => {
         fetch(e, {
           headers: n,
           method: t.method || (t.body ? "POST" : "GET"),
           body: t.body
         }).then(async (u) => {
-          var k, U;
-          for (let a of [...Object.values(w2.interceptors), ...Object.values(this.interceptors)])
-            await new Promise((O) => a(u, () => O()));
-          const R = u.headers.get("Content-Length"), L = R ? parseInt(R, 10) : 0;
-          let M = 0;
-          const N = (k = u.body) == null ? void 0 : k.getReader(), et = new ReadableStream({
-            start(a) {
-              function O() {
-                N == null || N.read().then((B) => {
-                  if (B.done)
-                    return a.close();
-                  M += B.value.byteLength, y(M / L), a.enqueue(B.value), O();
-                }).catch((B) => a.error(B));
+          var G, U;
+          for (let l of [...Object.values(w2.interceptors), ...Object.values(this.interceptors)])
+            await new Promise((R) => l(u, () => R()));
+          const v = u.headers.get("Content-Length"), N = v ? parseInt(v, 10) : 0;
+          let P = 0;
+          const I = (G = u.body) == null ? void 0 : G.getReader(), ot = new ReadableStream({
+            start(l) {
+              function R() {
+                I == null || I.read().then((O) => {
+                  if (O.done) return l.close();
+                  P += O.value.byteLength, a(P / N), l.enqueue(O.value), R();
+                }).catch((O) => l.error(O));
               }
-              O();
+              R();
             }
           });
-          if (u.data = new Response(et), t.decode == null || t.decode) {
-            const a = (U = u.headers.get("Content-Type")) == null ? void 0 : U.toLowerCase();
-            a != null && a.includes("form") ? u.data = await u.data.formData() : a != null && a.includes("json") ? u.data = await u.data.json() : a != null && a.includes("text") ? u.data = await u.data.text() : a != null && a.includes("application") && (u.data = await u.data.blob());
+          if (u.data = new Response(ot), t.decode == null || t.decode) {
+            const l = (U = u.headers.get("Content-Type")) == null ? void 0 : U.toLowerCase();
+            l != null && l.includes("form") ? u.data = await u.data.formData() : l != null && l.includes("json") ? u.data = await u.data.json() : l != null && l.includes("text") ? u.data = await u.data.text() : l != null && l.includes("application") && (u.data = await u.data.blob());
           }
-          u.ok ? s(u) : i(u);
+          u.ok ? o(u) : i(u);
         });
       });
     }
   };
   c(w, "interceptors", {}), c(w, "headers", {});
-  function Ut(r) {
+  function Ht(r) {
     const t = r.split(".")[1].replace(/-/g, "+").replace(/_/g, "/");
-    return T(decodeURIComponent(atob(t).split("").map(function(e) {
+    return M(decodeURIComponent(atob(t).split("").map(function(e) {
       return "%" + ("00" + e.charCodeAt(0).toString(16)).slice(-2);
     }).join("")));
   }
-  const S = {
+  const x = {
     CLEAR: "\x1B[0m",
     BRIGHT: "\x1B[1m",
     DIM: "\x1B[2m",
@@ -354,7 +350,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     BLINK: "\x1B[5m",
     REVERSE: "\x1B[7m",
     HIDDEN: "\x1B[8m"
-  }, C = {
+  }, j = {
     BLACK: "\x1B[30m",
     RED: "\x1B[31m",
     GREEN: "\x1B[32m",
@@ -372,60 +368,186 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     LIGHT_CYAN: "\x1B[96m",
     WHITE: "\x1B[97m"
   };
-  const g = class g2 extends v {
+  const g = class g2 extends _ {
     constructor(t) {
       super(), this.namespace = t;
     }
-    pad(t, e, n, o = false) {
-      const s = t.toString(), i = e - s.length;
-      if (i <= 0)
-        return s;
-      const y = Array(~~(i / n.length)).fill(n).join("");
-      return o ? s + y : y + s;
+    pad(t, e, n, s = false) {
+      const o = t.toString(), i = e - o.length;
+      if (i <= 0) return o;
+      const a = Array(~~(i / n.length)).fill(n).join("");
+      return s ? o + a : a + o;
     }
     format(...t) {
       const e = /* @__PURE__ */ new Date();
       return `${`${e.getFullYear()}-${e.getMonth() + 1}-${e.getDate()} ${this.pad(e.getHours().toString(), 2, "0")}:${this.pad(e.getMinutes().toString(), 2, "0")}:${this.pad(e.getSeconds().toString(), 2, "0")}.${this.pad(e.getMilliseconds().toString(), 3, "0", true)}`}${this.namespace ? ` [${this.namespace}]` : ""} ${t.join(" ")}`;
     }
     debug(...t) {
-      if (g2.LOG_LEVEL < 4)
-        return;
+      if (g2.LOG_LEVEL < 4) return;
       const e = this.format(...t);
-      g2.emit(4, e), console.debug(C.LIGHT_GREY + e + S.CLEAR);
+      g2.emit(4, e), console.debug(j.LIGHT_GREY + e + x.CLEAR);
     }
     log(...t) {
-      if (g2.LOG_LEVEL < 3)
-        return;
+      if (g2.LOG_LEVEL < 3) return;
       const e = this.format(...t);
-      g2.emit(3, e), console.log(S.CLEAR + e);
+      g2.emit(3, e), console.log(x.CLEAR + e);
     }
     info(...t) {
-      if (g2.LOG_LEVEL < 2)
-        return;
+      if (g2.LOG_LEVEL < 2) return;
       const e = this.format(...t);
-      g2.emit(2, e), console.info(C.BLUE + e + S.CLEAR);
+      g2.emit(2, e), console.info(j.BLUE + e + x.CLEAR);
     }
     warn(...t) {
-      if (g2.LOG_LEVEL < 1)
-        return;
+      if (g2.LOG_LEVEL < 1) return;
       const e = this.format(...t);
-      g2.emit(1, e), console.warn(C.YELLOW + e + S.CLEAR);
+      g2.emit(1, e), console.warn(j.YELLOW + e + x.CLEAR);
     }
     error(...t) {
-      if (g2.LOG_LEVEL < 0)
-        return;
+      if (g2.LOG_LEVEL < 0) return;
       const e = this.format(...t);
-      g2.emit(0, e), console.error(C.RED + e + S.CLEAR);
+      g2.emit(0, e), console.error(j.RED + e + x.CLEAR);
     }
   };
   c(g, "LOG_LEVEL", 4);
-  function mt(r) {
+  function Ot(r) {
     return new Promise((t) => setTimeout(t, r));
   }
-  async function _t(r, t = 100) {
-    for (; await r(); )
-      await mt(t);
+  async function ie(r, t = 100) {
+    for (; await r(); ) await Ot(t);
   }
+  var $ = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, xt = {}, S = {};
+  Object.defineProperty(S, "__esModule", { value: true });
+  S.persist = S.Persist = void 0;
+  class st {
+    /**
+     * @param {string} key Primary key value will be stored under
+     * @param {PersistOptions<T>} options Configure using {@link PersistOptions}
+     */
+    constructor(t, e = {}) {
+      c(this, "key");
+      c(this, "options");
+      c(this, "storage");
+      c(this, "watches", {});
+      c(this, "_value");
+      this.key = t, this.options = e, this.storage = e.storage || localStorage, this.load();
+    }
+    /** Current value or default if undefined */
+    get value() {
+      var t;
+      return this._value !== void 0 ? this._value : (t = this.options) == null ? void 0 : t.default;
+    }
+    /** Set value with proxy object wrapper to sync future changes */
+    set value(t) {
+      t == null || typeof t != "object" ? this._value = t : this._value = new Proxy(t, {
+        get: (e, n) => typeof e[n] == "function" ? (...o) => {
+          const i = e[n](...o);
+          return this.save(), i;
+        } : e[n],
+        set: (e, n, s) => (e[n] = s, this.save(), true)
+      }), this.save();
+    }
+    /** Notify listeners of change */
+    notify(t) {
+      Object.values(this.watches).forEach((e) => e(t));
+    }
+    /** Delete value from storage */
+    clear() {
+      this.storage.removeItem(this.key);
+    }
+    /** Save current value to storage */
+    save() {
+      this._value === void 0 ? this.clear() : this.storage.setItem(this.key, JSON.stringify(this._value)), this.notify(this.value);
+    }
+    /** Load value from storage */
+    load() {
+      if (this.storage[this.key] != null) {
+        let t = JSON.parse(this.storage.getItem(this.key));
+        t != null && typeof t == "object" && this.options.type && (t.__proto__ = this.options.type.prototype), this.value = t;
+      } else
+        this.value = this.options.default || void 0;
+    }
+    /**
+     * Callback function which is run when there are changes
+     *
+     * @param {(value: T) => any} fn Callback will run on each change; it's passed the next value & it's return is ignored
+     * @returns {() => void} Function which will unsubscribe the watch/callback when called
+     */
+    watch(t) {
+      const e = Object.keys(this.watches).length;
+      return this.watches[e] = t, () => {
+        delete this.watches[e];
+      };
+    }
+    /**
+     * Return value as JSON string
+     *
+     * @returns {string} Stringified object as JSON
+     */
+    toString() {
+      return JSON.stringify(this.value);
+    }
+    /**
+     * Return current value
+     *
+     * @returns {T} Current value
+     */
+    valueOf() {
+      return this.value;
+    }
+  }
+  S.Persist = st;
+  function Bt(r) {
+    return (t, e) => {
+      const n = (r == null ? void 0 : r.key) || `${t.constructor.name}.${e.toString()}`, s = new st(n, r);
+      Object.defineProperty(t, e, {
+        get: function() {
+          return s.value;
+        },
+        set: function(o) {
+          s.value = o;
+        }
+      });
+    };
+  }
+  S.persist = Bt;
+  var L = {};
+  Object.defineProperty(L, "__esModule", { value: true });
+  L.MemoryStorage = void 0;
+  class At {
+    get length() {
+      return Object.keys(this).length;
+    }
+    clear() {
+      Object.keys(this).forEach((t) => this.removeItem(t));
+    }
+    getItem(t) {
+      return this[t];
+    }
+    key(t) {
+      return Object.keys(this)[t];
+    }
+    removeItem(t) {
+      delete this[t];
+    }
+    setItem(t, e) {
+      this[t] = e;
+    }
+  }
+  L.MemoryStorage = At;
+  (function(r) {
+    var t = $ && $.__createBinding || (Object.create ? function(n, s, o, i) {
+      i === void 0 && (i = o);
+      var a = Object.getOwnPropertyDescriptor(s, o);
+      (!a || ("get" in a ? !s.__esModule : a.writable || a.configurable)) && (a = { enumerable: true, get: function() {
+        return s[o];
+      } }), Object.defineProperty(n, i, a);
+    } : function(n, s, o, i) {
+      i === void 0 && (i = o), n[i] = s[o];
+    }), e = $ && $.__exportStar || function(n, s) {
+      for (var o in n) o !== "default" && !Object.prototype.hasOwnProperty.call(s, o) && t(s, n, o);
+    };
+    Object.defineProperty(r, "__esModule", { value: true }), e(S, r), e(L, r);
+  })(xt);
   var extendStatics = function(d, b) {
     extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
       d2.__proto__ = b2;
@@ -833,8 +955,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   var observable = function() {
     return typeof Symbol === "function" && Symbol.observable || "@@observable";
   }();
-  function identity(x) {
-    return x;
+  function identity(x2) {
+    return x2;
   }
   function pipeFromArray(fns) {
     if (fns.length === 0) {
@@ -915,8 +1037,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       promiseCtor = getPromiseCtor(promiseCtor);
       return new promiseCtor(function(resolve, reject) {
         var value;
-        _this.subscribe(function(x) {
-          return value = x;
+        _this.subscribe(function(x2) {
+          return value = x2;
         }, function(err) {
           return reject(err);
         }, function() {
@@ -1550,9 +1672,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @returns {Promise<any>} Session information returned from login request
      */
     login(spoke, login, password, twoFactor) {
-      return fetch(`${this.api.url + "login"}`, {
+      return fetch(`${this.api.url}login`, {
         method: "POST",
-        body: St(ot({
+        body: $t(ut({
           realm: spoke.trim(),
           login: login.trim(),
           password: password.trim(),
@@ -1561,7 +1683,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         }))
       }).then(async (resp) => {
         const data = await resp.json().catch(() => ({}));
-        if (!resp.ok || data["error"]) throw Object.assign(kt(resp.status, data.error) || {}, data);
+        if (!resp.ok || data["error"]) throw Object.assign(Yt(resp.status, data.error) || {}, data);
         this.api.token = data["token"];
         return data;
       });
@@ -1572,9 +1694,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @return {Promise<any>}
      */
     loginGuest() {
-      return fetch(`${this.api.url.replace("/api/", "/guest/")}`).then(async (resp) => {
+      return fetch(`${this.api.url}guest`).then(async (resp) => {
         const data = await resp.json().catch(() => ({}));
-        if (!resp.ok || data["error"]) throw Object.assign(kt(resp.status, data.error) || {}, data);
+        if (!resp.ok || data["error"]) throw Object.assign(Yt(resp.status, data.error) || {}, data);
         this.api.token = data["token"];
         return data;
       });
@@ -1666,11 +1788,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         data.append("", file, file.name);
         return fetch(this.url, {
           method: "POST",
-          headers: ot({ "Authorization": this.api.token ? `Bearer ${this.api.token}` : "" }),
+          headers: ut({ "Authorization": this.api.token ? `Bearer ${this.api.token}` : "" }),
           body: data
         }).then(async (resp) => {
           const data2 = await resp.json().catch(() => ({}));
-          if (!resp.ok || data2["error"]) throw Object.assign(kt(resp.status, data2.error) || {}, data2);
+          if (!resp.ok || data2["error"]) throw Object.assign(Yt(resp.status, data2.error) || {}, data2);
           return resp;
         });
       })).then(async (files2) => {
@@ -2066,7 +2188,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         if (!this.unsubscribe) this.unsubscribe = this.api.socket.sliceEvents(this.slice, (event) => {
           const ids = [...event.data.new, ...event.data.changed];
           new Slice(this.slice, this.api).select(ids).exec().rows().then((rows) => this.cache = [...this.cache.filter((c2) => c2.id != null && !ids.includes(c2.id)), ...rows]);
-          this.cache = this.cache.filter((v2) => v2.id && !event.data.lost.includes(v2.id));
+          this.cache = this.cache.filter((v) => v.id && !event.data.lost.includes(v.id));
         });
         return this.cache$;
       } else if (this.unsubscribe) {
@@ -2131,22 +2253,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "listeners", []);
       __publicField(this, "reconnect", false);
       __publicField(this, "socket");
+      __publicField(this, "_connected", false);
       this.api = api;
       this.options = options;
+      const url = new URL(this.api.url.replace("http", "ws"));
+      url.port = "9390";
       this.options = {
-        url: this.api.url.replace("http", "ws") + ":3000",
+        url: url.origin,
         ...this.options
       };
       if (this.options.url !== false)
         api.token$.pipe(distinctUntilChanged()).subscribe(() => this.connect());
     }
-    /**
-     * Is socket connected to Datalynk
-     * @return {boolean} true if connected, false if offline
-     */
-    get open() {
-      var _a;
-      return ((_a = this.socket) == null ? void 0 : _a.readyState) == 1;
+    get connected() {
+      return this._connected;
     }
     /**
      * Add listener for all socket events
@@ -2162,6 +2282,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * Close socket connection
      */
     close() {
+      this._connected = false;
       this.reconnect = false;
       this.socket.close();
     }
@@ -2171,28 +2292,34 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param {number} timeout Retry interval, defaults to 30s
      */
     connect(timeout = 3e4) {
-      if (this.options.url === false) throw new Error("Socket is disabled");
-      if (this.open) {
+      if (!this.options.url) throw new Error("Socket is disabled");
+      if (this.connected) {
         this.reconnect = false;
         this.socket.close();
       }
       this.socket = new WebSocket(this.options.url + (this.api.token ? `?token=${this.api.token}` : ""));
-      const t = setTimeout(() => {
-        if (this.open) return;
-        this.socket.close();
-        this.connect();
+      let t = setTimeout(() => {
+        if (this.reconnect && !this.connected) this.connect();
       }, timeout);
-      this.socket.onopen = () => {
-        clearTimeout(t);
-        this.reconnect = true;
-        console.debug("Datalynk Socket: Connected");
-      };
       this.socket.onmessage = (message) => {
         const payload = JSON.parse(message.data);
-        this.listeners.forEach((l) => l(payload));
+        if (payload.connected != void 0) {
+          if (payload.connected) {
+            clearTimeout(t);
+            t = null;
+            this._connected = true;
+            this.reconnect = true;
+            console.debug("Datalynk Socket: Connected");
+          } else {
+            throw new Error(`Socket failed to connect: ${payload.error}`);
+          }
+        } else {
+          this.listeners.forEach((l) => l(payload));
+        }
       };
       this.socket.onclose = () => {
-        if (this.reconnect) this.connect();
+        this._connected = false;
+        if (this.reconnect && !t) this.connect();
         console.debug("Datalynk Socket: Disconnected");
       };
     }
@@ -2212,14 +2339,15 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @return {Unsubscribe} Run returned function to unsubscribe callback
      */
     sliceEvents(slice, callback) {
-      _t(() => {
-        var _a;
-        return ((_a = this.socket) == null ? void 0 : _a.readyState) != 1;
-      }).then(() => this.send({ onSliceEvents: slice }));
+      let cancelled = false;
+      ie(() => !this.connected).then(() => {
+        if (!cancelled) this.send({ onSliceEvents: slice });
+      });
       const unsubscribe = this.addListener((event) => {
         if (event.type == "sliceEvents" && event.data.slice == slice) callback(event);
       });
       return () => {
+        cancelled = true;
         this.send({ offSliceEvents: slice });
         unsubscribe();
       };
@@ -2293,7 +2421,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       /** API Session token */
       __publicField(this, "token$", new BehaviorSubject(null));
       this.options = options;
-      this.url = `${url}${url.endsWith("/") ? "" : "/"}api/`;
+      this.url = `${new URL(url).origin}/api/`;
       this.options = {
         bundleTime: 100,
         origin: typeof location !== "undefined" ? location.host : "Unknown",
@@ -2321,21 +2449,21 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     /** Get session info from JWT payload */
     get jwtPayload() {
       if (!this.token) return null;
-      return Ut(this.token);
+      return Ht(this.token);
     }
     _request(req, options = {}) {
       return fetch(this.url, {
         method: "POST",
-        headers: ot({
+        headers: ut({
           Authorization: this.token ? `Bearer ${this.token}` : void 0,
           "Content-Type": "application/json"
         }),
         body: JSON.stringify(Api.translateTokens(req))
       }).then(async (resp) => {
-        if (!resp.ok) throw kt(resp.status);
+        if (!resp.ok) throw Yt(resp.status);
         let data = await resp.json();
         if (!options.raw) data = Api.translateTokens(data);
-        if (data["error"]) throw Object.assign(kt(resp.status, data["error"]) || {}, data);
+        if (data["error"]) throw Object.assign(Yt(resp.status, data["error"]) || {}, data);
         return data;
       });
     }