@resolveio/client-lib-core 1.3.20 → 1.4.1

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

@@ -222,6 +222,10 @@ class SocketService {
         this.readyState$ = new BehaviorSubject(0);
         //List of WebSocket sub-protocols
         this.protocols = [];
+        this.pingInterval = null;
+        this.pongTimeout = null;
+        this.pingIntervalTime = 15000; // Time between each ping (e.g., 30 seconds)
+        this.pongTimeoutTime = 12000; // Time to wait for pong before closing connection (e.g., 10 seconds)
         //Set up the default 'noop' event handlers
         this.onopen = function (event) { };
         this.onclose = function (event) { };
@@ -255,6 +259,7 @@ class SocketService {
                 this.readyState = WebSocket.OPEN;
                 this.readyState$.next(this.readyState);
                 this.onopen(event);
+                this.startPinging();
             };
             this.ws.onclose = (event) => {
                 if (this.timeout) {
@@ -269,9 +274,16 @@ class SocketService {
                 setTimeout(() => {
                     this.connect();
                 }, this.reconnectInterval);
+                this.stopPinging();
             };
             this.ws.onmessage = (event) => {
-                this.onmessage(event);
+                if (event.data === 'pong') {
+                    this.log(new Date(), 'WS', 'pong received');
+                    clearTimeout(this.pongTimeout);
+                }
+                else {
+                    this.onmessage(event);
+                }
             };
             this.ws.onerror = (event) => {
                 this.log(new Date(), 'WS', 'onerror', this, event);
@@ -280,6 +292,25 @@ class SocketService {
             };
         }
     }
+    startPinging() {
+        this.pingInterval = setInterval(() => {
+            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+                this.ws.send(['ping'].toString()); // You can adjust this based on the server's expectations
+                this.pongTimeout = setTimeout(() => {
+                    this.log(new Date(), 'WS', 'pong not received, closing connection');
+                    this.close();
+                }, this.pongTimeoutTime);
+            }
+        }, this.pingIntervalTime);
+    }
+    stopPinging() {
+        if (this.pingInterval) {
+            clearInterval(this.pingInterval);
+        }
+        if (this.pongTimeout) {
+            clearTimeout(this.pongTimeout);
+        }
+    }
     send(...data) {
         if (this.ws && this.ws.readyState === this.ws.OPEN) {
             this.ws.send(JSON.stringify(data));
@@ -291,9 +322,6 @@ class SocketService {
             return false;
         }
     }
-    /**
-     * Returns boolean, whether websocket was FORCEFULLY closed.
-     */
     close() {
         if (this.ws) {
             this.log(new Date(), 'WS', 'closing socket');
@@ -1203,18 +1231,11 @@ class SocketManagerService {
                 if (!this._runningQueue) {
                     if (this._sendQueue.length) {
                         this._runningQueue = true;
-                        for (let i = this._sendQueue.length - 1; i >= 0; i--) {
-                            if (this._socket && this._socket.ws) {
-                                if (this.socketStatus === WebSocket.OPEN) {
-                                    let nextSendItem = this._sendQueue.pop();
-                                    this._socket.send(...nextSendItem);
-                                }
-                                else {
-                                    break;
-                                }
-                            }
-                            else {
-                                break;
+                        if (this._socket && this._socket.ws) {
+                            let nextSendItem = this._sendQueue[this._sendQueue.length - 1];
+                            let sendStatus = this._socket.send(...nextSendItem);
+                            if (sendStatus) {
+                                this._sendQueue.pop();
                             }
                         }
                         this._runningQueue = false;
@@ -1314,14 +1335,7 @@ class SocketManagerService {
     }
     send(...data) {
         if (data[3] === 'subscription') {
-            if (this.socketStatus === WebSocket.OPEN) {
-                this._socket.send(...data);
-            }
-            else {
-                if (!this._sendQueue.filter(a => JSON.stringify(a) === JSON.stringify(data)).length) {
-                    this._sendQueue.splice(0, 0, data);
-                }
-            }
+            this._socket.send(...data);
         }
         else if (data[3] === 'method') {
             if (this.socketStatus === WebSocket.OPEN) {
@@ -1406,9 +1420,7 @@ class SocketManagerService {
             }
         }
         else if (data[3] === 'offline') {
-            if (this.socketStatus === WebSocket.OPEN) {
-                this._socket.send(...data);
-            }
+            this._socket.send(...data);
         }
     }
     getStatus() {