@resolveio/client-lib-core 15.1.0 → 15.1.2

package/fesm2020/resolveio-client-lib-core.mjs

@@ -232,6 +232,7 @@ class SocketService {
         this.onconnecting = function () { };
         this.onmessage = function (event) { };
         this.onerror = function (event) { };
+        document.addEventListener('visibilitychange', this.handleVisibilityChange.bind(this));
     }
     openSocket(environment, protocols) {
         this.url = environment.WS_URL;
@@ -272,7 +273,7 @@ class SocketService {
                 this.log(new Date(), 'WS', 'onclose', this.url);
                 this.onclose(event);
                 setTimeout(() => {
-                    this.connect();
+                    this.reconnect();
                 }, this.reconnectInterval);
                 this.stopPinging();
             };
@@ -290,7 +291,7 @@ class SocketService {
             this.ws.onerror = (event) => {
                 this.log(new Date(), 'WS', 'onerror', this, event);
                 this.onerror(event);
-                this.reconnect();
+                this.close();
             };
         }
     }
@@ -316,13 +317,16 @@ class SocketService {
     }
     startPinging() {
         this.pingInterval = setInterval(() => {
-            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+            if (this.isWebSocketActive()) {
                 this.send('ping');
                 this.pongTimeout = setTimeout(() => {
                     this.log(new Date(), 'WS', 'pong not received, closing connection');
                     this.close();
                 }, this.pongTimeoutTime);
             }
+            else {
+                this.reconnect();
+            }
         }, this.pingIntervalTime);
     }
     stopPinging() {
@@ -348,7 +352,7 @@ class SocketService {
         }
     }
     send(...data) {
-        if (this.ws && this.ws.readyState === this.ws.OPEN) {
+        if (this.isWebSocketActive()) {
             data.forEach(item => this.convertDatesToUTC(item));
             this.ws.send(JSON.stringify(data));
             return true;
@@ -371,12 +375,12 @@ class SocketService {
     }
     reconnect() {
         this.log(new Date(), 'WS', 'reconnect', this.readyState);
-        if (this.readyState === WebSocket.OPEN) {
-            this.close();
-        }
-        else if (this.readyState === WebSocket.CLOSING || this.readyState === WebSocket.CLOSED) {
+        if (this.readyState === WebSocket.CLOSED) {
             this.connect();
         }
+        else if (this.readyState !== WebSocket.CONNECTING) {
+            this.close();
+        }
     }
     getBufferAmount() {
         if (this.ws) {
@@ -391,6 +395,16 @@ class SocketService {
             console.log(...args);
         }
     }
+    handleVisibilityChange() {
+        if (document.visibilityState === 'visible') {
+            if (!this.isWebSocketActive()) {
+                this.reconnect();
+            }
+        }
+    }
+    isWebSocketActive() {
+        return this.ws && this.ws.readyState === WebSocket.OPEN;
+    }
 }
 SocketService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketService, deps: [{ token: i1$2.LocalStorageService }], target: i0.ɵɵFactoryTarget.Injectable });
 SocketService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: SocketService });