Merge pull request #123 from kuzzleio/hotfix-122-too-many-reconnect

[MASTER] Hotfix #122 too many reconnect

Author: AnthonySendra

CHANGELOG.md

@@ -1,5 +1,9 @@
 *__note:__ the # at the end of lines are the pull request numbers on GitHub*
 
+# 2.1.5
+
+* Hotfixed a bug when recovering from a websocket connection error created an exponential number of clients #122
+
 # 2.1.4
 
 * https://github.com/kuzzleio/sdk-javascript/releases/tag/2.1.4

dist/kuzzle.js

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {

dist/kuzzle.js.map

@@ -3,6 +3,7 @@
  * @param host
  * @param wsPort
  * @param ioPort
+ * @param sslConnection
  * @returns {Object} tnstantiated WebSocket/Socket.IO object
  */
 
@@ -11,7 +12,7 @@ function network(host, wsPort, ioPort, sslConnection) {
   if (typeof window !== 'undefined') {
     // use native websockets if the browser supports it
     if (typeof WebSocket !== 'undefined') {
-      return new (require('./wrappers/wsbrowsers'))(host, wsPort, sslConnection);
+      return new (require('./wrappers/websocket'))(host, wsPort, sslConnection);
     }
     // otherwise fallback to socket.io, if available
     else if (window.io) {
@@ -21,7 +22,7 @@ function network(host, wsPort, ioPort, sslConnection) {
     throw new Error('Aborting: no websocket support detected and no socket.io library loaded either.');
   }
 
-  return new (require('./wrappers/wsnode'))(host, wsPort, sslConnection);
+  return new (require('./wrappers/websocket'))(host, wsPort, sslConnection);
 }
 
 module.exports = network;

package.json

@@ -1,17 +1,20 @@
-function WSBrowsers(host, port, ssl) {
+function WSNode(host, port, ssl) {
   var self = this;
+  this.WebSocket = typeof WebSocket !== 'undefined' ? WebSocket : require('ws');
   this.host = host;
   this.port = port;
   this.ssl = ssl;
   this.client = null;
+  this.wasConnected = false;
   this.retrying = false;
+  this.lasturl = null;
 
   /*
-     Listeners are stored using the following format:
-     roomId: {
-     fn: callback_function,
-     once: boolean
-     }
+   Listeners are stored using the following format:
+   roomId: {
+   fn: callback_function,
+   once: boolean
+   }
    */
   this.listeners = {
     error: [],
@@ -29,15 +32,25 @@ function WSBrowsers(host, port, ssl) {
    * @returns {Object} Socket
    */
   this.connect = function (autoReconnect, reconnectionDelay) {
-    this.client = new WebSocket((this.ssl ? 'wss://' : 'ws://') + this.host + ':' + this.port);
+    var
+      url = (this.ssl ? 'wss://' : 'ws://') + this.host + ':' + this.port,
+      options = typeof window !== 'undefined' ? undefined : {perMessageDeflate: false};
+
+    if (url !== this.lasturl) {
+      self.wasConnected = false;
+      this.lasturl = url;
+    }
+
+    this.client = new this.WebSocket(url, options);
 
     this.client.onopen = function () {
-      if (self.retrying) {
+      if (self.wasConnected) {
         poke(self.listeners, 'reconnect');
       }
       else {
         poke(self.listeners, 'connect');
       }
+      self.wasConnected = true;
     };
 
     this.client.onclose = function (code, message) {
@@ -54,7 +67,7 @@ function WSBrowsers(host, port, ssl) {
     };
 
     this.client.onmessage = function (payload) {
-      var data = JSON.parse(payload.data);
+      var data = JSON.parse(payload.data || payload);
 
       if (data.room && self.listeners[data.room]) {
         poke(self.listeners, data.room, data);
@@ -190,7 +203,7 @@ function WSBrowsers(host, port, ssl) {
       reconnect: []
     };
 
-    this.retrying = false;
+    this.wasConnected = false;
     this.client.close();
     this.client = null;
   };
@@ -242,15 +255,15 @@ function poke (listeners, roomId, payload) {
 function onClientError(autoReconnect, reconnectionDelay, message) {
   var self = this;
 
-  if (autoReconnect) {
+  if (autoReconnect && !self.retrying) {
     self.retrying = true;
     setTimeout(function () {
+      self.retrying = false;
       self.connect(autoReconnect, reconnectionDelay);
     }, reconnectionDelay);
   }
 
   poke(self.listeners, 'error', message);
 }
 
-
-module.exports = WSBrowsers;
+module.exports = WSNode;