@auxilium/datalynk-client 0.8.1 → 0.8.2

package/dist/index.cjs

@@ -2176,9 +2176,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   class Socket {
     constructor(api, options = {}) {
       __publicField(this, "listeners", []);
-      __publicField(this, "reconnect", false);
+      __publicField(this, "retry");
       __publicField(this, "socket");
-      __publicField(this, "_connected", false);
+      __publicField(this, "open", false);
       this.api = api;
       this.options = options;
       const url = new URL(this.api.url.replace("http", "ws"));
@@ -2190,9 +2190,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (this.options.url !== false)
         api.token$.pipe(distinctUntilChanged()).subscribe(() => this.connect());
     }
-    get connected() {
-      return this._connected;
-    }
     /**
      * Add listener for all socket events
      *
@@ -2207,46 +2204,46 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * Close socket connection
      */
     close() {
-      this._connected = false;
-      this.reconnect = false;
-      this.socket.close();
+      var _a;
+      if (this.open) console.debug("Datalynk socket: disconnected");
+      this.open = false;
+      (_a = this.socket) == null ? void 0 : _a.close();
+      this.socket = void 0;
+      if (this.retry) clearTimeout(this.retry);
+      this.retry = null;
     }
     /**
      * Connect socket client to socket server
-     *
-     * @param {number} timeout Retry interval, defaults to 30s
+     * @param {number} timeout Retry to connect every x seconds
      */
-    connect(timeout = 3e4) {
-      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}` : ""));
-      let t = setTimeout(() => {
-        if (this.reconnect && !this.connected) this.connect();
-      }, timeout);
-      this.socket.onmessage = (message) => {
-        const payload = JSON.parse(message.data);
-        if (payload.connected != void 0) {
-          if (payload.connected) {
-            clearTimeout(t);
-            t = null;
-            this._connected = true;
-            this.reconnect = true;
-            console.debug("Datalynk Socket: Connected");
+    connect(timeout = 30) {
+      if (!this.options.url) throw new Error("Datalynk socket disabled");
+      if (this.open) this.close();
+      this.retry = setTimeout(() => {
+        if (this.open) return;
+        this.close();
+        this.connect();
+      }, timeout * 1e3);
+      if (navigator.onLine) {
+        this.socket = new WebSocket(this.options.url + (this.api.token ? `?token=${this.api.token}` : ""));
+        this.socket.onopen = () => clearTimeout(this.retry);
+        this.socket.onclose = () => {
+          if (this.open) this.connect(timeout);
+        };
+        this.socket.onmessage = (message) => {
+          const payload = JSON.parse(message.data);
+          if (payload.connected != void 0) {
+            if (payload.connected) {
+              this.open = true;
+              console.debug("Datalynk socket: connected");
+            } else {
+              throw new Error(`Datalynk socket failed: ${payload.error}`);
+            }
           } else {
-            throw new Error(`Socket failed to connect: ${payload.error}`);
+            this.listeners.forEach((l) => l(payload));
           }
-        } else {
-          this.listeners.forEach((l) => l(payload));
-        }
-      };
-      this.socket.onclose = () => {
-        this._connected = false;
-        if (this.reconnect && !t) this.connect();
-        console.debug("Datalynk Socket: Disconnected");
-      };
+        };
+      }
     }
     /**
      * Send data to socket server
@@ -2254,7 +2251,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param payload Data that will be serialized
      */
     send(payload) {
-      this.socket.send(JSON.stringify(payload));
+      var _a;
+      if (!this.open) throw new Error("Datalynk socket not connected");
+      (_a = this.socket) == null ? void 0 : _a.send(JSON.stringify(payload));
     }
     /**
      * Run callback whenever the server notifies us of slice changes
@@ -2265,7 +2264,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      */
     sliceEvents(slice, callback) {
       let cancelled = false;
-      sleepWhile(() => !this.connected).then(() => {
+      sleepWhile(() => !this.open).then(() => {
         if (!cancelled) this.send({ onSliceEvents: slice });
       });
       const unsubscribe = this.addListener((event) => {

package/dist/index.mjs

@@ -2172,9 +2172,9 @@ class Slice {
 class Socket {
   constructor(api, options = {}) {
     __publicField(this, "listeners", []);
-    __publicField(this, "reconnect", false);
+    __publicField(this, "retry");
     __publicField(this, "socket");
-    __publicField(this, "_connected", false);
+    __publicField(this, "open", false);
     this.api = api;
     this.options = options;
     const url = new URL(this.api.url.replace("http", "ws"));
@@ -2186,9 +2186,6 @@ class Socket {
     if (this.options.url !== false)
       api.token$.pipe(distinctUntilChanged()).subscribe(() => this.connect());
   }
-  get connected() {
-    return this._connected;
-  }
   /**
    * Add listener for all socket events
    *
@@ -2203,46 +2200,46 @@ class Socket {
    * Close socket connection
    */
   close() {
-    this._connected = false;
-    this.reconnect = false;
-    this.socket.close();
+    var _a;
+    if (this.open) console.debug("Datalynk socket: disconnected");
+    this.open = false;
+    (_a = this.socket) == null ? void 0 : _a.close();
+    this.socket = void 0;
+    if (this.retry) clearTimeout(this.retry);
+    this.retry = null;
   }
   /**
    * Connect socket client to socket server
-   *
-   * @param {number} timeout Retry interval, defaults to 30s
+   * @param {number} timeout Retry to connect every x seconds
    */
-  connect(timeout = 3e4) {
-    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}` : ""));
-    let t = setTimeout(() => {
-      if (this.reconnect && !this.connected) this.connect();
-    }, timeout);
-    this.socket.onmessage = (message) => {
-      const payload = JSON.parse(message.data);
-      if (payload.connected != void 0) {
-        if (payload.connected) {
-          clearTimeout(t);
-          t = null;
-          this._connected = true;
-          this.reconnect = true;
-          console.debug("Datalynk Socket: Connected");
+  connect(timeout = 30) {
+    if (!this.options.url) throw new Error("Datalynk socket disabled");
+    if (this.open) this.close();
+    this.retry = setTimeout(() => {
+      if (this.open) return;
+      this.close();
+      this.connect();
+    }, timeout * 1e3);
+    if (navigator.onLine) {
+      this.socket = new WebSocket(this.options.url + (this.api.token ? `?token=${this.api.token}` : ""));
+      this.socket.onopen = () => clearTimeout(this.retry);
+      this.socket.onclose = () => {
+        if (this.open) this.connect(timeout);
+      };
+      this.socket.onmessage = (message) => {
+        const payload = JSON.parse(message.data);
+        if (payload.connected != void 0) {
+          if (payload.connected) {
+            this.open = true;
+            console.debug("Datalynk socket: connected");
+          } else {
+            throw new Error(`Datalynk socket failed: ${payload.error}`);
+          }
         } else {
-          throw new Error(`Socket failed to connect: ${payload.error}`);
+          this.listeners.forEach((l) => l(payload));
         }
-      } else {
-        this.listeners.forEach((l) => l(payload));
-      }
-    };
-    this.socket.onclose = () => {
-      this._connected = false;
-      if (this.reconnect && !t) this.connect();
-      console.debug("Datalynk Socket: Disconnected");
-    };
+      };
+    }
   }
   /**
    * Send data to socket server
@@ -2250,7 +2247,9 @@ class Socket {
    * @param payload Data that will be serialized
    */
   send(payload) {
-    this.socket.send(JSON.stringify(payload));
+    var _a;
+    if (!this.open) throw new Error("Datalynk socket not connected");
+    (_a = this.socket) == null ? void 0 : _a.send(JSON.stringify(payload));
   }
   /**
    * Run callback whenever the server notifies us of slice changes
@@ -2261,7 +2260,7 @@ class Socket {
    */
   sliceEvents(slice, callback) {
     let cancelled = false;
-    sleepWhile(() => !this.connected).then(() => {
+    sleepWhile(() => !this.open).then(() => {
       if (!cancelled) this.send({ onSliceEvents: slice });
     });
     const unsubscribe = this.addListener((event) => {

package/dist/socket.d.ts

@@ -27,10 +27,9 @@ export declare class Socket {
     private readonly api;
     readonly options: SocketOptions;
     private listeners;
-    private reconnect;
-    private socket;
-    private _connected;
-    get connected(): boolean;
+    private retry?;
+    private socket?;
+    open: boolean;
     constructor(api: Api, options?: SocketOptions);
     /**
      * Add listener for all socket events
@@ -45,8 +44,7 @@ export declare class Socket {
     close(): void;
     /**
      * Connect socket client to socket server
-     *
-     * @param {number} timeout Retry interval, defaults to 30s
+     * @param {number} timeout Retry to connect every x seconds
      */
     connect(timeout?: number): void;
     /**

package/dist/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAA;CACP,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC,CAAC;AAEH,yBAAyB;AACzB,MAAM,MAAM,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;CACpB,CAAA;AAED,qBAAqB;AACrB,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC;AACrE,8CAA8C;AAC9C,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,iCAAiC;AACjC,qBAAa,MAAM;IAQN,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,OAAO,EAAE,aAAa;IAP7E,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAa;IAE3B,OAAO,CAAC,UAAU,CAAS;IAC3B,IAAI,SAAS,YAA8B;gBAEd,GAAG,EAAE,GAAG,EAAkB,OAAO,GAAE,aAAkB;IAalF;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,cAAc,GAAG,WAAW;IAK5C;;OAEG;IACH,KAAK;IAML;;;;OAIG;IACH,OAAO,CAAC,OAAO,SAAQ;IA0CvB;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG;IAIjB;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,cAAc,CAAC,gBAAgB,CAAC,GAAG,WAAW;CAmBlH"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,CAAA;CACP,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC,CAAC;AAEH,yBAAyB;AACzB,MAAM,MAAM,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;CACpB,CAAA;AAED,qBAAqB;AACrB,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC;AACrE,8CAA8C;AAC9C,MAAM,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC;AAErC,iCAAiC;AACjC,qBAAa,MAAM;IAON,OAAO,CAAC,QAAQ,CAAC,GAAG;aAAuB,OAAO,EAAE,aAAa;IAN7E,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,KAAK,CAAC,CAAM;IACpB,OAAO,CAAC,MAAM,CAAC,CAAY;IAE3B,IAAI,UAAS;gBAEgB,GAAG,EAAE,GAAG,EAAkB,OAAO,GAAE,aAAkB;IAalF;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,cAAc,GAAG,WAAW;IAK5C;;OAEG;IACH,KAAK;IASL;;;OAGG;IACH,OAAO,CAAC,OAAO,GAAE,MAAW;IA8B5B;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,GAAG;IAKjB;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,cAAc,CAAC,gBAAgB,CAAC,GAAG,WAAW;CAmBlH"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@auxilium/datalynk-client",
 	"description": "Datalynk client library",
 	"repository": "https://gitlab.auxiliumgroup.com/auxilium/datalynk/datalynk-client",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",