cordova-plugin-mqtt-pahojs - npm Package Compare versions

Comparing version 1.5.5 to 1.5.6

package.json

 {
   "name": "cordova-plugin-mqtt-pahojs",
   "cordova_name": "MQTT JavaScript Client",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Pure JavaScript MQTT client library. Wrapper for paho.js",
@@ -6,0 +6,0 @@ "scripts": {

www/mqtt.js

 var Paho = require('./paho_mqttws31');
 var EventEmitter = require('com.feedhenry.eventemitter.EventEmitter');
 var SYSTEM_EVENTS = {
-    'status': true,
-    'disconnected': true,
-    'data': true,
-    'connecting': true,
-    'schedule_reconnect': true,
-    'connected': true,
-    'disconnect': true
+  'status': true,
+  'disconnected': true,
+  'data': true,
+  'connecting': true,
+  'schedule_reconnect': true,
+  'connected': true,
+  'disconnect': true
 };
 
 function MQTTClient(options) {
-    EventEmitter(this);
-    this.uri = options.uri || 'mqtt://' + options.host + ':' + (options.port || 8080);
-    if (this.uri.substring(this.uri.length - 1) !== '/') this.uri += '/';
-    this.disconnectNormally = false;
-    this.connected = false;
-    this.reconnectTry = 0;
-    this.clientId = options.clientId || options.clientID || options.client || "BeeToo";
-    this.userName = options.userName ? '' + options.userName : null;
-    this.password = options.password ? '' + options.password : null;
-    this.reportConnectionStatus = options.reportConnectionStatus || false;
-    this.restoreConnection = true;
-    this.reconnectDelay = options.reconnectDelay || [1000, 1000, 1000, 10000, 10000, 60000];
-    if (!Array.isArray(this.reconnectDelay))
-        this.reconnectDelay = [this.reconnectDelay];
-    this.reconnectDelayIdx = null;
-    this.timeout = Math.round((options.timeout || 15000) / 1000);
-    if (typeof options.reconnect !== 'undefined') this.restoreConnection = options.reconnect ? true : false;
-    this._setupConnection();
+  EventEmitter(this);
+  this.uri = options.uri || 'mqtt://' + options.host + ':' + (options.port || 8080);
+  if (this.uri.substring(this.uri.length - 1) !== '/') this.uri += '/';
+  this.disconnectNormally = false;
+  this.connected = false;
+  this.reconnectTry = 0;
+  this.clientId = options.clientId || options.clientID || options.client || "BeeToo";
+  this.userName = options.userName ? '' + options.userName : null;
+  this.password = options.password ? '' + options.password : null;
+  this.reportConnectionStatus = options.reportConnectionStatus || false;
+  this.restoreConnection = true;
+  this.reconnectDelay = options.reconnectDelay || [1000, 1000, 1000, 10000, 10000, 60000];
+  if (!Array.isArray(this.reconnectDelay))
+    this.reconnectDelay = [this.reconnectDelay];
+  this.reconnectDelayIdx = null;
+  this.timeout = Math.round((options.timeout || 15000) / 1000);
+  if (typeof options.reconnect !== 'undefined') this.restoreConnection = options.reconnect ? true : false;
+  this._setupConnection();
 }
@@ -37,193 +37,194 @@
 MQTTClient.prototype._showConnectionStatus = function(status) {
-    if (status && this.reportConnectionStatus)
-        window.plugins && window.plugins.toast && window.plugins.toast.showLongBottom(status);
-    this.emit('status', status);
+  if (status && this.reportConnectionStatus)
+    window.plugins && window.plugins.toast && window.plugins.toast.showLongBottom(status);
+  this.emit('status', status);
 };
 
 MQTTClient.prototype._setupConnection = function() {
-    if (this.connection) {
-        try {
-            this.connection.onConnectionLost = function() {
-                console.debug('stale onConnectionLost called');
-            };
-            this.connection.onMessageArrived = function() {
-                console.debug('stale onMessageArrived called');
-            };
-            this.connection.isConnected() && this.connection.disconnect();
-        } catch (e) {}
-    }
-    this.connection = new Paho.MQTT.Client(this.uri, this.clientId);
-    this.connection.onConnectionLost = this._connectionLost.bind(this);
-    this.connection.onMessageArrived = this._onMessageArrived.bind(this);
+  if (this.connection) {
+    this.connection.onConnectionLost = function() {
+      console.debug('stale onConnectionLost called');
+    };
+    this.connection.onMessageArrived = function() {
+      console.debug('stale onMessageArrived called');
+    };
+  }
+  this.connection = new Paho.MQTT.Client(this.uri, this.clientId);
+  this.connection.onConnectionLost = this._connectionLost.bind(this);
+  this.connection.onMessageArrived = this._onMessageArrived.bind(this);
 };
 
 MQTTClient.prototype._connectionLost = function() {
-    this.connected = false;
-    this.reconnectTry = 0;
-    this.emit('disconnected');
-    if (this.restoreConnection && !this.disconnectNormally) this.reconnect();
+  this.connected = false;
+  this.reconnectTry = 0;
+  this.emit('disconnected');
+  if (this.restoreConnection && !this.disconnectNormally) this.reconnect();
 };
 
 MQTTClient.prototype._onMessageArrived = function(msg) {
-    this.emit('data', msg);
-    if (!SYSTEM_EVENTS[msg.destinationName])
-        this.emit(msg.destinationName, msg.payloadString);
+  this.emit('data', msg);
+  if (!SYSTEM_EVENTS[msg.destinationName])
+    this.emit(msg.destinationName, msg.payloadString);
 };
 
 MQTTClient.prototype._shouldReconnect = function() {
-    if (this.reconnectDelayIdx !== null && this.reconnectDelay[this.reconnectDelayIdx] === -1)
-        return false;
-    return true;
+  if (this.reconnectDelayIdx !== null && this.reconnectDelay[this.reconnectDelayIdx] === -1)
+    return false;
+  return true;
 }
 
 MQTTClient.prototype._startReconnectCounter = function(callback) {
-    this.reconnectCounterCounted = 0;
-    this._showReconnectToast(this.reconnectDelay[this.reconnectDelayIdx]);
-    this.reconnectCounter = setInterval(function() {
-        this.reconnectCounterCounted += 1000;
-        var time = (this.reconnectDelay[this.reconnectDelayIdx] - this.reconnectCounterCounted);
-        if (time > 0)
-            this._showReconnectToast(time);
-        else {
-            this.reconnectCounterCounted = 0;
-            this._stopReconnectCounter();
-            callback && callback();
-        }
-    }.bind(this), 1000);
+  this.reconnectCounterCounted = 0;
+  this._showReconnectToast(this.reconnectDelay[this.reconnectDelayIdx]);
+  this.reconnectCounter = setInterval(function() {
+    this.reconnectCounterCounted += 1000;
+    var time = (this.reconnectDelay[this.reconnectDelayIdx] - this.reconnectCounterCounted);
+    if (time > 0)
+      this._showReconnectToast(time);
+    else {
+      this.reconnectCounterCounted = 0;
+      this._stopReconnectCounter();
+      callback && callback();
+    }
+  }.bind(this), 1000);
 }
 
-MQTTClient.prototype._showReconnectToast = function(time /*in ms*/ ) {
-    this._showConnectionStatus('Reconnecting in ' + Math.round(time / 1000) + 's');
+MQTTClient.prototype._showReconnectToast = function(time /*in ms*/) {
+  this._showConnectionStatus('Reconnecting in ' + Math.round(time / 1000) + 's');
 }
 
 MQTTClient.prototype._incrementReconnectDelayIdx = function() {
-    if (this.reconnectDelayIdx === null)
-        return this.reconnectDelayIdx = 0;
-    this.reconnectDelayIdx++;
-    if (this.reconnectDelayIdx >= this.reconnectDelay.length)
-        return this.reconnectDelayIdx = 0;
-    return this.reconnectDelayIdx;
+  if (this.reconnectDelayIdx === null)
+    return this.reconnectDelayIdx = 0;
+  this.reconnectDelayIdx++;
+  if (this.reconnectDelayIdx >= this.reconnectDelay.length)
+    return this.reconnectDelayIdx = 0;
+  return this.reconnectDelayIdx;
 }
 
 MQTTClient.prototype._stopReconnectCounter = function() {
-    if (this.reconnectCounter)
-        clearInterval(this.reconnectCounter);
+  if (this.reconnectCounter)
+    clearInterval(this.reconnectCounter);
 }
 
 MQTTClient.prototype.connect = function(reconnect) {
-    if (!reconnect)
-        this._markDisconnected();
-    this._stopReconnectCounter();
-    this._showConnectionStatus('Connecting...');
-    this.emit('connecting');
-    this.disconnectNormally = false;
-    return new Promise(function(resolve, reject) {
-        function connectionFailed(error) {
-            this.connected = false;
-            this._incrementReconnectDelayIdx();
-            if (this.restoreConnection && !this.disconnectNormally && this._shouldReconnect()) {
-                this._startReconnectCounter(this.reconnect.bind(this));
-                this.emit('schedule_reconnect', this.reconnectDelay);
-            } else {
-                this.disconnect();
-            }
-            reject && reject(error);
-        };
+  if (!reconnect)
+    this._markDisconnected();
+  this._stopReconnectCounter();
+  this._showConnectionStatus('Connecting...');
+  this.emit('connecting');
+  this.disconnectNormally = false;
+  return new Promise(function(resolve, reject) {
+    function connectionFailed(error) {
+      this.connected = false;
+      this._incrementReconnectDelayIdx();
+      if (this.restoreConnection && !this.disconnectNormally && this._shouldReconnect()) {
+        this._startReconnectCounter(this.reconnect.bind(this));
+        this.emit('schedule_reconnect', this.reconnectDelay);
+      } else {
+        this.disconnect();
+      }
+      reject && reject(error);
+    };
 
-        function connectionSuccess() {
-            this.connected = true;
-            this.reconnectTry = 0;
-            this.reconnectDelayIdx = null;
-            resolve && resolve();
-            this._showConnectionStatus('Connected');
-            this.emit('connected');
-        };
+    function connectionSuccess() {
+      this.connected = true;
+      this.reconnectTry = 0;
+      this.reconnectDelayIdx = null;
+      resolve && resolve();
+      this._showConnectionStatus('Connected');
+      this.emit('connected');
+    };
 
-        var connectionParams = {
-            onSuccess: connectionSuccess.bind(this),
-            onFailure: connectionFailed.bind(this)
-        };
-        if (this.userName && this.userName.length) {
-            connectionParams.userName = this.userName;
-            connectionParams.password = this.password;
-        }
-        if (this.keepAliveInterval) connectionParams.keepAliveInterval = this.keepAliveInterval;
-        if (this.timeout) connectionParams.timeout = this.timeout;
-        try {
-            this.connection.connect(connectionParams);
-        } catch (e) {
-            reject && reject(e);
-        }
-    }.bind(this));
+    var connectionParams = {
+      onSuccess: connectionSuccess.bind(this),
+      onFailure: connectionFailed.bind(this)
+    };
+    if (this.userName && this.userName.length) {
+      connectionParams.userName = this.userName;
+      connectionParams.password = this.password;
+    }
+    if (this.keepAliveInterval) connectionParams.keepAliveInterval = this.keepAliveInterval;
+    if (this.timeout) connectionParams.timeout = this.timeout;
+    try {
+      this.connection.connect(connectionParams);
+    } catch (e) {
+      reject && reject(e);
+    }
+  }.bind(this));
 };
 
 MQTTClient.prototype.isConnected = function() {
-    return this.connected;
+  return this.connected;
 };
 
 MQTTClient.prototype.reconnect = function() {
-    function _connect() {
-        this.connect(true).catch(function(e) {
-            console.error('Error connecting, cause: ' + (e ? (e.message || e.errorMessage) : 'unknown reason'));
-        });
+  function _connect() {
+    this.connect(true).catch(function(e) {
+      console.error('Error connecting, cause: ' + (e ? (e.message || e.errorMessage) : 'unknown reason'));
+    });
+  }
+
+  this.disconnectNormally = false;
+  if (this.connected) {
+    try {
+      this.disconnect();
+    } catch (e) {
+      console.error('Error disconnecting, cause: ' + (e ? (e.message || e.errorMessage) : 'unknown reason'));
+
+    } finally {
+      setTimeout(_connect.bind(this), 0);
     }
-    this.disconnectNormally = false;
-    if (this.connected) {
-        try {
-            this.disconnect();
-        } catch (e) {
-            console.error('Error disconnecting, cause: ' + (e ? (e.message || e.errorMessage) : 'unknown reason'));
-        } finally {
-            setTimeout(_connect.bind(this), 0);
-        }
-    } else {
-        this._setupConnection();
-        _connect.apply(this);
-    }
+  } else {
+    this._setupConnection();
+    _connect.apply(this);
+  }
 };
 
 MQTTClient.prototype._markDisconnected = function() {
-    this.reconnectDelayIdx = null;
-    this.disconnectNormally = true;
-    this.reconnectTry = 0;
-    this.connected = false;
+  this.reconnectDelayIdx = null;
+  this.disconnectNormally = true;
+  this.reconnectTry = 0;
+  this.connected = false;
 }
 
 MQTTClient.prototype.disconnect = function() {
-    this._stopReconnectCounter();
-    this.emit('disconnect');
-    this._markDisconnected();
-    if (this.connection.isConnected())
-        this.connection.disconnect();
-    this._showConnectionStatus('Disconnected');
+  this._stopReconnectCounter();
+  this.emit('disconnect');
+  this._markDisconnected();
+  try {
+    this.connection.disconnect();
+  } catch (e) {
+  }
+  this._showConnectionStatus('Disconnected');
 };
 
 MQTTClient.prototype.publish = function(topic, payload, options) {
-    if (!options) options = {};
-    if (typeof options === undefined && typeof topic === 'undefined') {
-        options = payload;
-        topic = options.topic;
-        payload = options.payload;
-    }
-    const message = new Paho.MQTT.Message(payload);
-    message.destinationName = topic;
-    if (typeof options.qos !== undefined) {
-        const qos = parseInt(options.qos);
-        if (!isNaN(qos)) message.qos = qos;
-    }
-    if (typeof options.retained !== undefined) message.retained = options.retained ? true : false;
-    else if (typeof options.retain !== undefined) message.retain = options.retain ? true : false;
-    message.onFailure = function() {
-        this._showConnectionStatus('Sent error');
-    }.bind(this);
-    this.connection.send(message);
+  if (!options) options = {};
+  if (typeof options === undefined && typeof topic === 'undefined') {
+    options = payload;
+    topic = options.topic;
+    payload = options.payload;
+  }
+  const message = new Paho.MQTT.Message(payload);
+  message.destinationName = topic;
+  if (typeof options.qos !== undefined) {
+    const qos = parseInt(options.qos);
+    if (!isNaN(qos)) message.qos = qos;
+  }
+  if (typeof options.retained !== undefined) message.retained = options.retained ? true : false;
+  else if (typeof options.retain !== undefined) message.retain = options.retain ? true : false;
+  message.onFailure = function() {
+    this._showConnectionStatus('Sent error');
+  }.bind(this);
+  this.connection.send(message);
 };
 
 MQTTClient.prototype.subscribe = function(filter, options) {
-    this.connection.subscribe(filter, options);
+  this.connection.subscribe(filter, options);
 }
 MQTTClient.prototype.unsubscribe = function(filter, options) {
-    this.connection.unsubscribe(filter, options);
+  this.connection.unsubscribe(filter, options);
 }
 
 module.exports = MQTTClient;

New alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Fixed alerts

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

98748

increased by1.92%

Worsened metrics

Lines of code

2215

decreased by-0.05%

No dependency changes