sockstream - npm Package Compare versions

Comparing version 1.3.2 to 1.3.3

dist/sockstream.js

@@ -11,2 +11,4 @@ 'use strict';
 
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -34,2 +36,9 @@
 
+    var clientName = 'sockstream.js';
+    var clientVersion = '1.3.3';
+    var defaultKeepAlive = 800;
+    var defaultDebugLevel = 0;
+    var defaultPort = 8082;
+    var defaultProto = 'wss://';
+    var defaultHost = '127.0.0.1';
     this.callbackRegister = {
@@ -44,2 +53,4 @@ ping: function ping(message) {
     };
+    this.maxKeepAliveAttempt = 20;
+    this.keepAliveAttempt = 0;
     this.disconnect = [];
@@ -49,13 +60,11 @@ this.connections = {};
       client: {
-        name: 'sockstream.js',
-        version: 1.2,
-        debugLevel: 0,
-        keepAlive: 800
+        name: clientName,
+        version: clientVersion,
+        debugLevel: defaultDebugLevel,
+        keepAlive: defaultKeepAlive
       },
       server: {
-        name: 'sockets/php-stream-socket-server',
-        version: 1.3,
-        hostname: 'localhost',
-        port: 8082,
-        proto: 'wss://'
+        hostname: defaultHost,
+        port: defaultPort,
+        proto: defaultProto
       }
@@ -66,7 +75,7 @@ };
         this._config.client = Object.assign({
-          debugLevel: 0,
-          keepAlive: 800
+          debugLevel: defaultDebugLevel,
+          keepAlive: defaultKeepAlive
         }, host.client, {
-          name: 'sockstream.js',
-          version: 0.1
+          name: clientName,
+          version: clientVersion
         });
@@ -76,9 +85,6 @@ }
         this._config.server = Object.assign({
-          hostname: 'localhost',
-          port: 8082,
-          proto: 'wss://'
-        }, host.server, {
-          name: 'sockets/php-stream-socket-server',
-          version: 1.3
-        });
+          hostname: defaultHost,
+          port: defaultPort,
+          proto: defaultProto
+        }, host.server);
       }
@@ -88,4 +94,4 @@ } else {
         client: {
-          name: 'sockstream.js',
-          version: 0.1,
+          name: clientName,
+          version: clientVersion,
           debugLevel: debugLevel,
@@ -95,4 +101,2 @@ keepAlive: keepAlive
         server: {
-          name: 'sockets/php-stream-socket-server',
-          version: 1.3,
           hostname: host,
@@ -119,2 +123,4 @@ port: port,
     }(function (message) {
+      var _console2;
+
       var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'log';
@@ -129,3 +135,3 @@
       };
-      this._config.client.debugLevel >= (levelMap[type] || 0) && console[type](message);
+      this._config.client.debugLevel >= (levelMap[type] || 0) && (_console2 = console)[type].apply(_console2, _toConsumableArray(message));
     })
@@ -209,6 +215,11 @@
       this.lastConnectionId = connectionId;
-      this.connections[connectionId] = new WebSocket('' + this._config.server.proto + this._config.server.hostname + ':' + this._config.server.port);
+      try {
+        this.connections[connectionId] = new WebSocket('' + this._config.server.proto + this._config.server.hostname + ':' + this._config.server.port);
+      } catch (e) {
+        return;
+      }
       if (this.connections[connectionId].readyState === this.connections[connectionId].CONNECTING) {
         this.connections[connectionId].onopen = function () {
           _this2.console('connected', 'info');
+          _this2.keepAliveAttempt = 0;
           setTimeout(function () {
@@ -219,3 +230,3 @@ _this2.send('connecting', cb);
         this.connections[connectionId].onerror = function (e) {
-          _this2.console(['WebSocket error', e], 'error');
+          _this2.console(e, 'error');
         };
@@ -228,7 +239,9 @@ this.connections[connectionId].onmessage = function (e) {
             } else if (typeof _this2.callbackRegister[parsed['@meta']._id] === 'function') {
-              _this2.callbackRegister[parsed['@meta']._id].call(_this2._config, parsed.message || null);
+              _this2.callbackRegister[parsed['@meta']._id].call(_this2._config, parsed.message);
               delete _this2.callbackRegister[parsed['@meta']._id];
             }
+            _this2.console(['[RCVD]', parsed.message], 'debug');
+          } else {
+            _this2.console(['[RCVD]', e.data], 'debug');
           }
-          _this2.console(['[RCVD]', parsed], 'debug');
         };
@@ -238,6 +251,15 @@ this.connections[connectionId].onclose = function (e) {
           if (_this2.disconnect.indexOf(connectionId) === -1 && typeof _this2._config.client.keepAlive === 'number' && _this2._config.client.keepAlive > 0) {
+            if (++_this2.keepAliveAttempt > _this2.maxKeepAliveAttempt) {
+              return;
+            }
+            var timeout = _this2._config.client.keepAlive;
+            if (_this2.keepAliveAttempt > 5) {
+              timeout = timeout + timeout / 2;
+            } else if (_this2.keepAliveAttempt > 10) {
+              timeout = timeout * 2;
+            }
             setTimeout(function () {
               _this2.console('Attempting to reestablish WebSocket', 'info');
               _this2.open();
-            }, _this2._config.client.keepAlive);
+            }, timeout);
           }
@@ -250,2 +272,13 @@ delete _this2.connections[connectionId];
     }
+
+    /**
+     * @param number int
+     */
+
+  }, {
+    key: 'setMaxKeepAliveAttempt',
+    value: function setMaxKeepAliveAttempt(number) {
+      this.maxKeepAliveAttempt = typeof number === 'number' ? number : this.maxKeepAliveAttempt;
+      return this;
+    }
   }], [{
@@ -280,3 +313,2 @@ key: 'generateUUID',
 
-exports.default = StreamSock;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["sockstream.js"],"names":["StreamSock","host","port","secure","keepAlive","debugLevel","callbackRegister","ping","send","console","message","system","disconnect","connections","_config","client","name","version","server","hostname","proto","Object","assign","type","levelMap","setting","debug","connectionId","id","lastConnectionId","push","close","cb","readyState","OPEN","_id","generateUUID","JSON","stringify","WebSocket","CONNECTING","onopen","setTimeout","onerror","e","onmessage","parsed","parseMessage","data","_type","call","_system","onclose","indexOf","open","d","Date","getTime","window","performance","now","replace","c","r","Math","random","floor","toString","parse"],"mappings":"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","file":"sockstream.js","sourcesContent":["export default class StreamSock {\n  /**\n   * @param {string|Object} host Either define the host name (and further optional attributes), OR pass in a configuration object\n   * @param port\n   * @param secure\n   * @param keepAlive\n   * @param debugLevel\n   */\n  constructor(host = 'localhost', port = 8082, secure = true, keepAlive = 800, debugLevel = 0) {\n    this.callbackRegister = {\n      ping: message => {\n        this.send('pong')\n        this.console(['[PING]', message])\n      },\n      system: message => {\n        this.console(['[SYSTEM]', message])\n      }\n    }\n    this.disconnect = [];\n    this.connections = {};\n    this._config = {\n      client: {\n        name: 'sockstream.js',\n        version: 1.2,\n        debugLevel: 0,\n        keepAlive: 800\n      },\n      server: {\n        name: 'sockets/php-stream-socket-server',\n        version: 1.3,\n        hostname: 'localhost',\n        port: 8082,\n        proto: 'wss://'\n      }\n    }\n    if (typeof host === 'object') {\n      if (typeof host.client === 'object') {\n        this._config.client = Object.assign({\n          debugLevel: 0,\n          keepAlive: 800\n        }, host.client, {\n          name: 'sockstream.js',\n          version: 0.1\n        })\n      }\n      if (typeof host.server === 'object') {\n        this._config.server = Object.assign({\n          hostname: 'localhost',\n          port: 8082,\n          proto: 'wss://'\n        }, host.server, {\n          name: 'sockets/php-stream-socket-server',\n          version: 1.3\n        })\n      }\n    } else {\n      this._config = {\n        client: {\n          name: 'sockstream.js',\n          version: 0.1,\n          debugLevel: debugLevel,\n          keepAlive: keepAlive\n        },\n        server: {\n          name: 'sockets/php-stream-socket-server',\n          version: 1.3,\n          hostname: host,\n          port: port,\n          proto: !!secure ? 'wss://' : 'ws://'\n        }\n      }\n    }\n  }\n\n  console(message, type = 'log') {\n    let levelMap = {\n      'log': 4,\n      'debug': 3,\n      'info': 2,\n      'warn': 1,\n      'error': 0\n    }\n    this._config.client.debugLevel >= (levelMap[type]||0) && console[type](message)\n  }\n\n  /**\n   * Either retrieves or sets the debug config value\n   * @param setting\n   * @returns {boolean}\n   */\n  debug(setting) {\n    if (typeof setting !== 'undefined') {\n      this._config.client.debug = !!setting\n    }\n    return this._config.client.debug\n  }\n\n  static generateUUID() {\n    let d = new Date().getTime();\n    if (window.performance && typeof window.performance.now === 'function') {\n      d += performance.now();\n    }\n    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {\n      let r = (d + Math.random() * 16) % 16 | 0;\n      d = Math.floor(d / 16);\n      return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);\n    })\n  }\n\n  static parseMessage(message) {\n    if (typeof message === 'undefined') {\n      return null\n    } else if (typeof message === 'string') {\n      return JSON.parse(message)\n    } else {\n      return message;\n    }\n  }\n\n  close(connectionId = null) {\n    let id = connectionId || this.lastConnectionId;\n    if (typeof this.connections[id] !== 'undefined') {\n      this.disconnect.push(id)\n      this.connections[id].close()\n    }\n    return true;\n  }\n\n  /**\n   * @param {string} message\n   * @param {string|function} cb either define a closure or pass in a connectionId\n   * @returns {boolean}\n   */\n  send(message, cb) {\n    let connectionId = this.lastConnectionId\n    if (typeof cb !== 'function' && typeof this.connections[cb] !== 'undefined' ) {\n      this.lastConnectionId = connectionId = cb\n    }\n    if (typeof this.connections[connectionId] === 'undefined' ) {\n      return false;\n    }\n\n    if (this.connections[connectionId].readyState === this.connections[connectionId].OPEN) {\n      let _id = StreamSock.generateUUID()\n      if (typeof cb === 'function') {\n        this.callbackRegister[_id] = cb\n      }\n      this.connections[connectionId].send(JSON.stringify({\n        '@meta': Object.assign({\n          '_id': _id\n        }, this._config),\n        'message': message\n      }))\n      return true\n    } else {\n      this.console('WebSocket not open', 'warn')\n    }\n    return false\n  }\n\n  /**\n   * Opens a new WebSocket connection, it does not over-write existing open connections\n   * @param {function} cb\n   * @returns {string} connectionId\n   */\n  open(cb) {\n    this.console(['[CONNECTING]',`${this._config.server.proto}${this._config.server.hostname}:${this._config.server.port}`], 'info')\n    let connectionId = StreamSock.generateUUID()\n    this.lastConnectionId = connectionId\n    this.connections[connectionId] = new WebSocket(`${this._config.server.proto}${this._config.server.hostname}:${this._config.server.port}`)\n    if (this.connections[connectionId].readyState === this.connections[connectionId].CONNECTING) {\n      this.connections[connectionId].onopen = () => {\n        this.console('connected', 'info')\n        setTimeout(() => {\n          this.send('connecting', cb)\n        }, 20)\n      }\n      this.connections[connectionId].onerror = e => {\n        this.console(['WebSocket error', e], 'error')\n      }\n      this.connections[connectionId].onmessage = e => {\n        let parsed = StreamSock.parseMessage(e.data);\n        if (parsed && typeof parsed['@meta'] !== 'undefined') {\n          if (typeof this.callbackRegister[parsed['@meta']._type] === 'function') {\n            this.callbackRegister[parsed['@meta']._type].call(this._config, parsed['@meta']._system)\n          } else if (typeof this.callbackRegister[parsed['@meta']._id] === 'function') {\n            this.callbackRegister[parsed['@meta']._id].call(this._config, parsed.message || null)\n            delete this.callbackRegister[parsed['@meta']._id]\n          }\n        }\n        this.console(['[RCVD]', parsed], 'debug')\n      }\n      this.connections[connectionId].onclose = e => {\n        this.console(['WebSocket closed', e], 'warn')\n        if (this.disconnect.indexOf(connectionId) === -1 && typeof this._config.client.keepAlive === 'number' && this._config.client.keepAlive > 0) {\n          setTimeout(() => {\n            this.console('Attempting to reestablish WebSocket', 'info')\n            this.open()\n          }, this._config.client.keepAlive)\n        }\n        delete this.connections[connectionId]\n      }\n    }\n\n    return connectionId;\n  }\n}\n"]}
+exports.default = StreamSock;

dist/sockstream.min.js

@@ -1,1 +0,1 @@
-"use strict";function _classCallCheck(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},_createClass=function(){function e(e,n){for(var t=0;t<n.length;t++){var o=n[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(n,t,o){return t&&e(n.prototype,t),o&&e(n,o),n}}(),StreamSock=function(){function e(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"localhost",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:8082,o=!(arguments.length>2&&void 0!==arguments[2])||arguments[2],i=this,s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:800,c=arguments.length>4&&void 0!==arguments[4]?arguments[4]:0;_classCallCheck(this,e),this.callbackRegister={ping:function(e){i.send("pong"),i.console(["[PING]",e])},system:function(e){i.console(["[SYSTEM]",e])}},this.disconnect=[],this.connections={},this._config={client:{name:"sockstream.js",version:1.2,debugLevel:0,keepAlive:800},server:{name:"sockets/php-stream-socket-server",version:1.3,hostname:"localhost",port:8082,proto:"wss://"}},"object"===("undefined"==typeof n?"undefined":_typeof(n))?("object"===_typeof(n.client)&&(this._config.client=Object.assign({debugLevel:0,keepAlive:800},n.client,{name:"sockstream.js",version:.1})),"object"===_typeof(n.server)&&(this._config.server=Object.assign({hostname:"localhost",port:8082,proto:"wss://"},n.server,{name:"sockets/php-stream-socket-server",version:1.3}))):this._config={client:{name:"sockstream.js",version:.1,debugLevel:c,keepAlive:s},server:{name:"sockets/php-stream-socket-server",version:1.3,hostname:n,port:t,proto:o?"wss://":"ws://"}}}return _createClass(e,[{key:"console",value:function(e){function n(n){return e.apply(this,arguments)}return n.toString=function(){return e.toString()},n}(function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"log",t={log:4,debug:3,info:2,warn:1,error:0};this._config.client.debugLevel>=(t[n]||0)&&console[n](e)})},{key:"debug",value:function(e){return"undefined"!=typeof e&&(this._config.client.debug=!!e),this._config.client.debug}},{key:"close",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,n=e||this.lastConnectionId;return"undefined"!=typeof this.connections[n]&&(this.disconnect.push(n),this.connections[n].close()),!0}},{key:"send",value:function(n,t){var o=this.lastConnectionId;if("function"!=typeof t&&"undefined"!=typeof this.connections[t]&&(this.lastConnectionId=o=t),"undefined"==typeof this.connections[o])return!1;if(this.connections[o].readyState===this.connections[o].OPEN){var i=e.generateUUID();return"function"==typeof t&&(this.callbackRegister[i]=t),this.connections[o].send(JSON.stringify({"@meta":Object.assign({_id:i},this._config),message:n})),!0}return this.console("WebSocket not open","warn"),!1}},{key:"open",value:function(n){var t=this;this.console(["[CONNECTING]",""+this._config.server.proto+this._config.server.hostname+":"+this._config.server.port],"info");var o=e.generateUUID();return this.lastConnectionId=o,this.connections[o]=new WebSocket(""+this._config.server.proto+this._config.server.hostname+":"+this._config.server.port),this.connections[o].readyState===this.connections[o].CONNECTING&&(this.connections[o].onopen=function(){t.console("connected","info"),setTimeout(function(){t.send("connecting",n)},20)},this.connections[o].onerror=function(e){t.console(["WebSocket error",e],"error")},this.connections[o].onmessage=function(n){var o=e.parseMessage(n.data);o&&"undefined"!=typeof o["@meta"]&&("function"==typeof t.callbackRegister[o["@meta"]._type]?t.callbackRegister[o["@meta"]._type].call(t._config,o["@meta"]._system):"function"==typeof t.callbackRegister[o["@meta"]._id]&&(t.callbackRegister[o["@meta"]._id].call(t._config,o.message||null),delete t.callbackRegister[o["@meta"]._id])),t.console(["[RCVD]",o],"debug")},this.connections[o].onclose=function(e){t.console(["WebSocket closed",e],"warn"),t.disconnect.indexOf(o)===-1&&"number"==typeof t._config.client.keepAlive&&t._config.client.keepAlive>0&&setTimeout(function(){t.console("Attempting to reestablish WebSocket","info"),t.open()},t._config.client.keepAlive),delete t.connections[o]}),o}}],[{key:"generateUUID",value:function(){var e=(new Date).getTime();return window.performance&&"function"==typeof window.performance.now&&(e+=performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(n){var t=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"==n?t:3&t|8).toString(16)})}},{key:"parseMessage",value:function(e){return"undefined"==typeof e?null:"string"==typeof e?JSON.parse(e):e}}]),e}();exports.default=StreamSock;
+"use strict";function _toConsumableArray(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},_createClass=function(){function e(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,n,o){return n&&e(t.prototype,n),o&&e(t,o),t}}(),StreamSock=function(){function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"localhost",n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:8082,o=!(arguments.length>2&&void 0!==arguments[2])||arguments[2],i=this,s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:800,r=arguments.length>4&&void 0!==arguments[4]?arguments[4]:0;_classCallCheck(this,e);var c="sockstream.js",a="1.3.3",l=800,f=0,u=8082,p="wss://",g="127.0.0.1";this.callbackRegister={ping:function(e){i.send("pong"),i.console(["[PING]",e])},system:function(e){i.console(["[SYSTEM]",e])}},this.maxKeepAliveAttempt=20,this.keepAliveAttempt=0,this.disconnect=[],this.connections={},this._config={client:{name:c,version:a,debugLevel:f,keepAlive:l},server:{hostname:g,port:u,proto:p}},"object"===("undefined"==typeof t?"undefined":_typeof(t))?("object"===_typeof(t.client)&&(this._config.client=Object.assign({debugLevel:f,keepAlive:l},t.client,{name:c,version:a})),"object"===_typeof(t.server)&&(this._config.server=Object.assign({hostname:g,port:u,proto:p},t.server))):this._config={client:{name:c,version:a,debugLevel:r,keepAlive:s},server:{hostname:t,port:n,proto:o?"wss://":"ws://"}}}return _createClass(e,[{key:"console",value:function(e){function t(t){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(e){var t,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"log",o={log:4,debug:3,info:2,warn:1,error:0};this._config.client.debugLevel>=(o[n]||0)&&(t=console)[n].apply(t,_toConsumableArray(e))})},{key:"debug",value:function(e){return"undefined"!=typeof e&&(this._config.client.debug=!!e),this._config.client.debug}},{key:"close",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=e||this.lastConnectionId;return"undefined"!=typeof this.connections[t]&&(this.disconnect.push(t),this.connections[t].close()),!0}},{key:"send",value:function(t,n){var o=this.lastConnectionId;if("function"!=typeof n&&"undefined"!=typeof this.connections[n]&&(this.lastConnectionId=o=n),"undefined"==typeof this.connections[o])return!1;if(this.connections[o].readyState===this.connections[o].OPEN){var i=e.generateUUID();return"function"==typeof n&&(this.callbackRegister[i]=n),this.connections[o].send(JSON.stringify({"@meta":Object.assign({_id:i},this._config),message:t})),!0}return this.console("WebSocket not open","warn"),!1}},{key:"open",value:function(t){var n=this;this.console(["[CONNECTING]",""+this._config.server.proto+this._config.server.hostname+":"+this._config.server.port],"info");var o=e.generateUUID();this.lastConnectionId=o;try{this.connections[o]=new WebSocket(""+this._config.server.proto+this._config.server.hostname+":"+this._config.server.port)}catch(e){return}return this.connections[o].readyState===this.connections[o].CONNECTING&&(this.connections[o].onopen=function(){n.console("connected","info"),n.keepAliveAttempt=0,setTimeout(function(){n.send("connecting",t)},20)},this.connections[o].onerror=function(e){n.console(e,"error")},this.connections[o].onmessage=function(t){var o=e.parseMessage(t.data);o&&"undefined"!=typeof o["@meta"]?("function"==typeof n.callbackRegister[o["@meta"]._type]?n.callbackRegister[o["@meta"]._type].call(n._config,o["@meta"]._system):"function"==typeof n.callbackRegister[o["@meta"]._id]&&(n.callbackRegister[o["@meta"]._id].call(n._config,o.message),delete n.callbackRegister[o["@meta"]._id]),n.console(["[RCVD]",o.message],"debug")):n.console(["[RCVD]",t.data],"debug")},this.connections[o].onclose=function(e){if(n.console(["WebSocket closed",e],"warn"),n.disconnect.indexOf(o)===-1&&"number"==typeof n._config.client.keepAlive&&n._config.client.keepAlive>0){if(++n.keepAliveAttempt>n.maxKeepAliveAttempt)return;var t=n._config.client.keepAlive;n.keepAliveAttempt>5?t+=t/2:n.keepAliveAttempt>10&&(t=2*t),setTimeout(function(){n.console("Attempting to reestablish WebSocket","info"),n.open()},t)}delete n.connections[o]}),o}},{key:"setMaxKeepAliveAttempt",value:function(e){return this.maxKeepAliveAttempt="number"==typeof e?e:this.maxKeepAliveAttempt,this}}],[{key:"generateUUID",value:function(){var e=(new Date).getTime();return window.performance&&"function"==typeof window.performance.now&&(e+=performance.now()),"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var n=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"==t?n:3&n|8).toString(16)})}},{key:"parseMessage",value:function(e){return"undefined"==typeof e?null:"string"==typeof e?JSON.parse(e):e}}]),e}();exports.default=StreamSock;

gulpfile.babel.js

@@ -42,3 +42,4 @@ 'use strict';
     .pipe(babel({
-      presets: ['es2015', 'es2016', 'stage-0']
+      presets: ['es2015', 'es2016', 'stage-0'],
+      plugins: ['transform-es2015-destructuring']
     }))
@@ -75,2 +76,2 @@ .pipe(gulp.dest('./build'))
     .pipe(gulp.dest('./dist'))
-});
+});

package.json

 {
   "name": "sockstream",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Provides a standard WebSocket thin manager",
@@ -31,2 +31,3 @@ "main": "src/sockstream.js",
     "babel-core": "^6.17.0",
+    "babel-plugin-transform-es2015-destructuring": "^6.16.0",
     "babel-polyfill": "^6.16.0",
@@ -43,7 +44,7 @@ "babel-preset-es2015": "^6.16.0",
     "gulp-if": "^2.0.1",
+    "gulp-minify": "latest",
     "gulp-sourcemaps": "^2.1.1",
     "gulp-uglify": "^2.0.0",
-    "run-sequence": "^1.2.2",
-    "gulp-minify": "latest"
+    "run-sequence": "^1.2.2"
   }
 }

src/sockstream.js

@@ -11,5 +11,3 @@ export default class StreamSock {
     let clientName = 'sockstream.js';
-    let clientVersion = '1.3.2';
-    let serverName = 'sockets/php-stream-socket-server';
-    let serverVersion = '1.3';
+    let clientVersion = '1.3.3';
     let defaultKeepAlive = 800;
@@ -29,2 +27,4 @@ let defaultDebugLevel = 0;
     }
+    this.maxKeepAliveAttempt = 20;
+    this.keepAliveAttempt = 0;
     this.disconnect = [];
@@ -40,4 +40,2 @@ this.connections = {};
       server: {
-        name: serverName,
-        version: serverVersion,
         hostname: defaultHost,
@@ -63,6 +61,3 @@ port: defaultPort,
           proto: defaultProto
-        }, host.server, {
-          name: serverName,
-          version: serverVersion
-        })
+        }, host.server)
       }
@@ -78,4 +73,2 @@ } else {
         server: {
-          name: serverName,
-          version: serverVersion,
           hostname: host,
@@ -97,3 +90,3 @@ port: port,
     }
-    this._config.client.debugLevel >= (levelMap[type]||0) && console[type](message)
+    this._config.client.debugLevel >= (levelMap[type]||0) && console[type](...message)
   }
@@ -185,6 +178,9 @@
     this.lastConnectionId = connectionId
-    this.connections[connectionId] = new WebSocket(`${this._config.server.proto}${this._config.server.hostname}:${this._config.server.port}`)
+    try {
+      this.connections[connectionId] = new WebSocket(`${this._config.server.proto}${this._config.server.hostname}:${this._config.server.port}`)
+    } catch(e){return}
     if (this.connections[connectionId].readyState === this.connections[connectionId].CONNECTING) {
       this.connections[connectionId].onopen = () => {
         this.console('connected', 'info')
+        this.keepAliveAttempt = 0
         setTimeout(() => {
@@ -195,3 +191,3 @@ this.send('connecting', cb)
       this.connections[connectionId].onerror = e => {
-        this.console(['WebSocket error', e], 'error')
+        this.console(e, 'error')
       }
@@ -204,7 +200,9 @@ this.connections[connectionId].onmessage = e => {
           } else if (typeof this.callbackRegister[parsed['@meta']._id] === 'function') {
-            this.callbackRegister[parsed['@meta']._id].call(this._config, parsed.message || null)
+            this.callbackRegister[parsed['@meta']._id].call(this._config, parsed.message)
             delete this.callbackRegister[parsed['@meta']._id]
           }
+          this.console(['[RCVD]', parsed.message], 'debug')
+        } else {
+          this.console(['[RCVD]', e.data], 'debug')
         }
-        this.console(['[RCVD]', parsed], 'debug')
       }
@@ -214,6 +212,15 @@ this.connections[connectionId].onclose = e => {
         if (this.disconnect.indexOf(connectionId) === -1 && typeof this._config.client.keepAlive === 'number' && this._config.client.keepAlive > 0) {
+          if (++this.keepAliveAttempt > this.maxKeepAliveAttempt) {
+            return;
+          }
+          let timeout = this._config.client.keepAlive;
+          if (this.keepAliveAttempt > 5) {
+            timeout = timeout + (timeout/2)
+          } else if (this.keepAliveAttempt > 10) {
+            timeout = timeout*2
+          }
           setTimeout(() => {
             this.console('Attempting to reestablish WebSocket', 'info')
             this.open()
-          }, this._config.client.keepAlive)
+          }, timeout)
         }
@@ -226,2 +233,10 @@ delete this.connections[connectionId]
   }
+
+  /**
+   * @param number int
+   */
+  setMaxKeepAliveAttempt(number) {
+    this.maxKeepAliveAttempt = typeof number === 'number' ? number : this.maxKeepAliveAttempt
+    return this
+  }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

553

increased by8.64%

Worsened metrics

Total package byte prevSize

37537

decreased by-29.09%

Dev dependency count

18

increased by5.88%

No dependency changes