chore(deps): bump all deps and fix breaking changes (#1631)

Author: robertsLando

examples/ws/client.js

@@ -15,7 +15,7 @@ const host = 'ws://localhost:8080'
 
 const options = {
   keepalive: 30,
-  clientId: clientId,
+  clientId,
   protocolId: 'MQTT',
   protocolVersion: 4,
   clean: true,

examples/wss/client_with_proxy.js

@@ -21,7 +21,7 @@ const proxyOpts = url.parse(proxy)
 proxyOpts.secureEndpoint = parsed.protocol ? parsed.protocol === 'wss:' : true
 const agent = new HttpsProxyAgent(proxyOpts)
 const wsOptions = {
-  agent: agent
+  agent
   // other wsOptions
   // foo:'bar'
 }
@@ -34,7 +34,7 @@ const mqttOptions = {
   connectTimeout: 30 * 1000,
   clean: true,
   clientId: 'testClient',
-  wsOptions: wsOptions
+  wsOptions
 }
 
 const client = mqtt.connect(parsed, mqttOptions)

lib/client.js

@@ -638,11 +638,11 @@ MqttClient.prototype.publish = function (topic, message, opts, callback) {
     }
     const packet = {
       cmd: 'publish',
-      topic: topic,
+      topic,
       payload: message,
       qos: opts.qos,
       retain: opts.retain,
-      messageId: messageId,
+      messageId,
       dup: opts.dup
     }
 
@@ -675,7 +675,7 @@ MqttClient.prototype.publish = function (topic, message, opts, callback) {
       {
         invoke: publishProc,
         cbStorePut: opts.cbStorePut,
-        callback: callback
+        callback
       }
     )
   }
@@ -750,7 +750,7 @@ MqttClient.prototype.subscribe = function () {
         that._resubscribeTopics[topic].qos < opts.qos ||
         resubscribe) {
         const currentOpts = {
-          topic: topic,
+          topic,
           qos: opts.qos
         }
         if (version === 5) {
@@ -805,7 +805,7 @@ MqttClient.prototype.subscribe = function () {
       qos: 1,
       retain: false,
       dup: false,
-      messageId: messageId
+      messageId
     }
 
     if (opts.properties) {
@@ -854,7 +854,7 @@ MqttClient.prototype.subscribe = function () {
     this._storeProcessingQueue.push(
       {
         invoke: subscribeProc,
-        callback: callback
+        callback
       }
     )
   }
@@ -911,7 +911,7 @@ MqttClient.prototype.unsubscribe = function () {
     const packet = {
       cmd: 'unsubscribe',
       qos: 1,
-      messageId: messageId
+      messageId
     }
 
     if (typeof topic === 'string') {
@@ -945,7 +945,7 @@ MqttClient.prototype.unsubscribe = function () {
     this._storeProcessingQueue.push(
       {
         invoke: unsubscribeProc,
-        callback: callback
+        callback
       }
     )
   }
@@ -1054,7 +1054,7 @@ MqttClient.prototype.end = function (force, opts, cb) {
 MqttClient.prototype.removeOutgoingMessage = function (messageId) {
   const cb = this.outgoing[messageId] ? this.outgoing[messageId].cb : null
   delete this.outgoing[messageId]
-  this.outgoingStore.del({ messageId: messageId }, function () {
+  this.outgoingStore.del({ messageId }, function () {
     cb(new Error('Message removed'))
   })
   return this
@@ -1297,7 +1297,7 @@ MqttClient.prototype._storePacket = function (packet, cb, cbStorePut) {
   }
   // check that the packet is not a qos of 0, or that the command is not a publish
   if (((storePacket.qos || 0) === 0 && this.queueQoSZero) || storePacket.cmd !== 'publish') {
-    this.queue.push({ packet: storePacket, cb: cb })
+    this.queue.push({ packet: storePacket, cb })
   } else if (storePacket.qos > 0) {
     cb = this.outgoing[storePacket.messageId] ? this.outgoing[storePacket.messageId].cb : null
     this.outgoingStore.put(storePacket, function (err) {
@@ -1533,10 +1533,10 @@ MqttClient.prototype._handlePublish = function (packet, done) {
         if (error) { return that.emit('error', error) }
         if (validReasonCodes.indexOf(code) === -1) { return that.emit('error', new Error('Wrong reason code for pubrec')) }
         if (code) {
-          that._sendPacket({ cmd: 'pubrec', messageId: messageId, reasonCode: code }, done)
+          that._sendPacket({ cmd: 'pubrec', messageId, reasonCode: code }, done)
         } else {
           that.incomingStore.put(packet, function () {
-            that._sendPacket({ cmd: 'pubrec', messageId: messageId }, done)
+            that._sendPacket({ cmd: 'pubrec', messageId }, done)
           })
         }
       })
@@ -1556,7 +1556,7 @@ MqttClient.prototype._handlePublish = function (packet, done) {
           if (err) {
             return done && done(err)
           }
-          that._sendPacket({ cmd: 'puback', messageId: messageId, reasonCode: code }, done)
+          that._sendPacket({ cmd: 'puback', messageId, reasonCode: code }, done)
         })
       })
       break
@@ -1642,7 +1642,7 @@ MqttClient.prototype._handleAck = function (packet) {
       response = {
         cmd: 'pubrel',
         qos: 2,
-        messageId: messageId
+        messageId
       }
       const pubrecRC = packet.reasonCode
 
@@ -1703,7 +1703,7 @@ MqttClient.prototype._handlePubrel = function (packet, callback) {
   const messageId = packet.messageId
   const that = this
 
-  const comp = { cmd: 'pubcomp', messageId: messageId }
+  const comp = { cmd: 'pubcomp', messageId }
 
   that.incomingStore.get(packet, function (err, pub) {
     if (!err) {

lib/connect/ali.js

@@ -114,7 +114,7 @@ function buildStream (client, opts) {
   const url = buildUrl(opts, client)
   my = opts.my
   my.connectSocket({
-    url: url,
+    url,
     protocols: websocketSubProtocol
   })
 

lib/connect/wx.js

@@ -97,7 +97,7 @@ function buildStream (client, opts) {
 
   const url = buildUrl(opts, client)
   socketTask = wx.connectSocket({
-    url: url,
+    url,
     protocols: [websocketSubProtocol]
   })
 

lib/topic-alias-send.js

@@ -3,7 +3,7 @@
 /**
  * Module dependencies
  */
-const LruMap = require('lru-cache')
+const LRUCache = require('lru-cache')
 const NumberAllocator = require('number-allocator').NumberAllocator
 
 /**
@@ -17,7 +17,7 @@ function TopicAliasSend (max) {
   }
 
   if (max > 0) {
-    this.aliasToTopic = new LruMap({ max: max })
+    this.aliasToTopic = new LRUCache({ max })
     this.topicToAlias = {}
     this.numberAllocator = new NumberAllocator(1, max)
     this.max = max
@@ -42,7 +42,7 @@ TopicAliasSend.prototype.put = function (topic, alias) {
   this.aliasToTopic.set(alias, topic)
   this.topicToAlias[topic] = alias
   this.numberAllocator.use(alias)
-  this.length = this.aliasToTopic.length
+  this.length = this.aliasToTopic.size
   return true
 }
 
@@ -72,7 +72,7 @@ TopicAliasSend.prototype.getAliasByTopic = function (topic) {
  * Clear all entries
  */
 TopicAliasSend.prototype.clear = function () {
-  this.aliasToTopic.reset()
+  this.aliasToTopic.clear()
   this.topicToAlias = {}
   this.numberAllocator.clear()
   this.length = 0
@@ -85,7 +85,8 @@ TopicAliasSend.prototype.clear = function () {
 TopicAliasSend.prototype.getLruAlias = function () {
   const alias = this.numberAllocator.firstVacant()
   if (alias) return alias
-  return this.aliasToTopic.keys()[this.aliasToTopic.length - 1]
+  // get last alias (key) from LRU cache
+  return [...this.aliasToTopic.keys()][this.aliasToTopic.size - 1]
 }
 
 module.exports = TopicAliasSend

lib/validations.js

@@ -48,5 +48,5 @@ function validateTopics (topics) {
 }
 
 module.exports = {
-  validateTopics: validateTopics
+  validateTopics
 }