New version 2.2.0

Author: goriunov

dist/browser/clusterws.js

@@ -55,7 +55,7 @@ var ClusterWS = function() {
     return function() {
         function s(e) {
             return this.events = new n(), this.isAlive = !0, this.channels = {}, this.useBinary = !1, 
-            this.reconnectionAttempted = 0, e.url ? (this.options = {
+            this.missedPing = 0, this.reconnectionAttempted = 0, e.url ? (this.options = {
                 url: e.url,
                 autoReconnect: e.autoReconnect || !1,
                 autoReconnectOptions: e.autoReconnectOptions ? {
@@ -94,7 +94,7 @@ var ClusterWS = function() {
                 return e.events.emit("error", t);
             }, this.websocket.onmessage = function(n) {
                 var o = "string" != typeof n.data ? String.fromCharCode.apply(null, new Uint8Array(n.data)) : n.data;
-                if ("#10" === o) return e.isAlive = !0;
+                if ("#0" === o) return e.missedPing = 0, e.send("#1", null, "ping");
                 try {
                     o = JSON.parse(o), function(t, e) {
                         var n = {
@@ -107,7 +107,7 @@ var ClusterWS = function() {
                             s: {
                                 c: function() {
                                     t.useBinary = e["#"][2].binary, t.pingInterval = setInterval(function() {
-                                        t.isAlive ? (t.send("#9", null, "ping"), t.isAlive = !1) : t.disconnect(4001, "No pong from the server");
+                                        return t.missedPing++ > 2 && t.disconnect(4001, "Did not get pings");
                                     }, e["#"][2].ping), t.events.emit("connect");
                                 }
                             }
@@ -118,7 +118,7 @@ var ClusterWS = function() {
                     return t(e);
                 }
             }, this.websocket.onclose = function(t) {
-                if (clearInterval(e.pingInterval), e.events.emit("disconnect", t.code, t.reason), 
+                if (e.missedPing = 0, clearInterval(e.pingInterval), e.events.emit("disconnect", t.code, t.reason), 
                 e.options.autoReconnect && 1e3 !== t.code && (0 === e.options.autoReconnectOptions.attempts || e.reconnectionAttempted < e.options.autoReconnectOptions.attempts)) e.websocket.readyState === e.websocket.CLOSED ? (e.reconnectionAttempted++, 
                 e.websocket = void 0, setTimeout(function() {
                     return e.create();

dist/browser/clusterws.min.js

@@ -5,6 +5,7 @@ export default class ClusterWS {
     isAlive: boolean;
     channels: CustomObject;
     useBinary: boolean;
+    missedPing: number;
     pingInterval: any;
     constructor(configurations: Configurations);
     on(event: 'error', listener: (err: any) => void): void;

dist/index.d.ts

@@ -51,7 +51,7 @@ function decode(t, e) {
         s: {
             c: function() {
                 t.useBinary = e["#"][2].binary, t.pingInterval = setInterval(function() {
-                    t.isAlive ? (t.send("#9", null, "ping"), t.isAlive = !1) : t.disconnect(4001, "No pong from the server");
+                    return t.missedPing++ > 2 && t.disconnect(4001, "Did not get pings");
                 }, e["#"][2].ping), t.events.emit("connect");
             }
         }
@@ -82,7 +82,7 @@ function encode(t, e, n) {
 var ClusterWS = function() {
     function t(t) {
         return this.events = new EventEmitter(), this.isAlive = !0, this.channels = {}, 
-        this.useBinary = !1, this.reconnectionAttempted = 0, t.url ? (this.options = {
+        this.useBinary = !1, this.missedPing = 0, this.reconnectionAttempted = 0, t.url ? (this.options = {
             url: t.url,
             autoReconnect: t.autoReconnect || !1,
             autoReconnectOptions: t.autoReconnectOptions ? {
@@ -118,14 +118,14 @@ var ClusterWS = function() {
             return t.events.emit("error", e);
         }, this.websocket.onmessage = function(e) {
             var n = "string" != typeof e.data ? String.fromCharCode.apply(null, new Uint8Array(e.data)) : e.data;
-            if ("#10" === n) return t.isAlive = !0;
+            if ("#0" === n) return t.missedPing = 0, t.send("#1", null, "ping");
             try {
                 n = JSON.parse(n), decode(t, n);
             } catch (t) {
                 return logError(t);
             }
         }, this.websocket.onclose = function(e) {
-            if (clearInterval(t.pingInterval), t.events.emit("disconnect", e.code, e.reason), 
+            if (t.missedPing = 0, clearInterval(t.pingInterval), t.events.emit("disconnect", e.code, e.reason), 
             t.options.autoReconnect && 1e3 !== e.code && (0 === t.options.autoReconnectOptions.attempts || t.reconnectionAttempted < t.options.autoReconnectOptions.attempts)) t.websocket.readyState === t.websocket.CLOSED ? (t.reconnectionAttempted++, 
             t.websocket = void 0, setTimeout(function() {
                 return t.create();

dist/index.js

@@ -1,6 +1,6 @@
 {
 	"name": "clusterws-client-js",
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"description": "JavaScript Client for ClusterWS - lightweight, fast and powerful framework for building horizontally & vertically scalable WebSocket applications in Node.js.",
 	"main": "index.js",
 	"types": "index.d.ts",

dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clusterws-client-js",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "JavaScript Client for ClusterWS - lightweight, fast and powerful framework for building horizontally & vertically scalable WebSocket applications in Node.js.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,4 +31,4 @@
     "ws client",
     "javascript"
   ]
-}
+}

package.json

@@ -11,6 +11,7 @@ export default class ClusterWS {
   public isAlive: boolean = true
   public channels: CustomObject = {}
   public useBinary: boolean = false
+  public missedPing: number = 0
   public pingInterval: any
 
   private options: Options
@@ -80,12 +81,14 @@ export default class ClusterWS {
         this.channels[keys[i]] && this.channels[keys[i]].subscribe()
     }
     this.websocket.onerror = (err: any): void => this.events.emit('error', err)
-    this.websocket.onmessage = (message: any): boolean => {
+    this.websocket.onmessage = (message: any): void => {
       let data: string = typeof message.data !== 'string' ?
         String.fromCharCode.apply(null, new Uint8Array(message.data)) : message.data
 
-      if (data === '#10')
-        return this.isAlive = true
+      if (data === '#0') {
+        this.missedPing = 0
+        return this.send('#1', null, 'ping')
+      }
 
       try {
         data = JSON.parse(data)
@@ -94,6 +97,7 @@ export default class ClusterWS {
     }
 
     this.websocket.onclose = (event: CloseEvent): void => {
+      this.missedPing = 0
       clearInterval(this.pingInterval)
       this.events.emit('disconnect', event.code, event.reason)
 

src/index.ts

@@ -15,14 +15,7 @@ export function decode(socket: ClusterWS, message: any): void {
     s: {
       c: (): void => {
         socket.useBinary = message['#'][2].binary
-        socket.pingInterval = setInterval(
-          (): void => {
-            if (socket.isAlive) {
-              socket.send('#9', null, 'ping')
-              socket.isAlive = false
-            } else socket.disconnect(4001, 'No pong from the server')
-          },
-          message['#'][2].ping)
+        socket.pingInterval = setInterval((): void => socket.missedPing++ > 2 && socket.disconnect(4001, 'Did not get pings'), message['#'][2].ping)
         socket.events.emit('connect')
       }
     }