aedes 0.51.1 → 0.51.3

package/aedes.js

@@ -172,7 +172,7 @@ function Aedes (opts) {
     if (that.clients[clientId] && serverId !== that.id) {
       if (that.clients[clientId].closed) {
         // remove the client from the list if it is already closed
-        delete that.clients[clientId]
+        that.deleteClient(clientId)
         done()
       } else {
         that.clients[clientId].close(done)
@@ -316,8 +316,7 @@ Aedes.prototype._finishRegisterClient = function (client) {
 }
 
 Aedes.prototype.unregisterClient = function (client) {
-  this.connectedClients--
-  delete this.clients[client.id]
+  this.deleteClient(client.id)
   this.emit('clientDisconnect', client)
   this.publish({
     topic: $SYS_PREFIX + this.id + '/disconnect/clients',
@@ -325,6 +324,11 @@ Aedes.prototype.unregisterClient = function (client) {
   }, noop)
 }
 
+Aedes.prototype.deleteClient = function (clientId) {
+  this.connectedClients--
+  delete this.clients[clientId]
+}
+
 function closeClient (client, cb) {
   this.clients[client].close(cb)
 }

package/lib/client.js

@@ -313,7 +313,14 @@ Client.prototype.close = function (done) {
           }, noop)
         }
       })
+    } else if (will) {
+      // delete the persisted will even on clean disconnect https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc385349232
+      that.broker.persistence.delWill({
+        id: that.id,
+        brokerId: that.broker.id
+      }, noop)
     }
+
     that.will = null // this function might be called twice
     that._will = null
 

package/lib/handlers/subscribe.js

@@ -155,6 +155,13 @@ function addSubs (sub, done) {
     func = blockDollarSignTopics(func)
   }
 
+  if (client.closed || client.broker.closed) {
+    // a hack, sometimes client.close() or broker.close() happened
+    // before authenticate() comes back
+    // we don't continue subscription here
+    return
+  }
+
   if (!client.subscriptions[topic]) {
     client.subscriptions[topic] = new Subscription(qos, func, rh, rap, nl)
     broker.subscribe(topic, func, done)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aedes",
-  "version": "0.51.1",
+  "version": "0.51.3",
   "description": "Stream-based MQTT broker",
   "main": "aedes.js",
   "types": "aedes.d.ts",
@@ -108,7 +108,7 @@
     "concat-stream": "^2.0.0",
     "duplexify": "^4.1.2",
     "license-checker": "^25.0.1",
-    "markdownlint-cli": "^0.39.0",
+    "markdownlint-cli": "^0.41.0",
     "mqtt": "^5.3.5",
     "mqtt-connection": "^4.1.0",
     "pre-commit": "^1.2.2",
@@ -117,7 +117,7 @@
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",
     "tap": "^16.3.10",
-    "tsd": "^0.30.4",
+    "tsd": "^0.31.0",
     "typescript": "^5.3.3",
     "websocket-stream": "^5.5.2"
   },
@@ -129,10 +129,10 @@
     "fastparallel": "^2.4.1",
     "fastseries": "^2.0.0",
     "hyperid": "^3.2.0",
-    "mqemitter": "^5.0.0",
+    "mqemitter": "^6.0.0",
     "mqtt-packet": "^9.0.0",
     "retimer": "^4.0.0",
     "reusify": "^1.0.4",
-    "uuid": "^9.0.1"
+    "uuid": "^10.0.0"
   }
 }

package/test/events.js

@@ -223,18 +223,20 @@ test('Test backpressure aedes published function', function (t) {
 })
 
 test('clear closed clients when the same clientId is managed by another broker', function (t) {
-  t.plan(1)
+  t.plan(2)
 
   const clientId = 'closed-client'
-  const broker = aedes()
+  const aedesBroker = aedes()
 
   // simulate a closed client on the broker
-  broker.clients[clientId] = { closed: true }
+  aedesBroker.clients[clientId] = { closed: true, broker: aedesBroker }
+  aedesBroker.connectedClients = 1
 
   // simulate the creation of the same client on another broker of the cluster
-  broker.publish({ topic: '$SYS/anotherbroker/new/clients', payload: clientId }, () => {
-    t.equal(broker.clients[clientId], undefined) // check that the closed client was removed
+  aedesBroker.publish({ topic: '$SYS/anotherbroker/new/clients', payload: clientId }, () => {
+    t.equal(aedesBroker.clients[clientId], undefined) // check that the closed client was removed
+    t.equal(aedesBroker.connectedClients, 0)
   })
 
-  t.teardown(broker.close.bind(broker))
+  t.teardown(aedesBroker.close.bind(aedesBroker))
 })

package/test/will.js

@@ -420,6 +420,29 @@ test('does not deliver will when client sends a DISCONNECT', function (t) {
   })
 })
 
+test('deletes from persistence on DISCONNECT', function (t) {
+  t.plan(2)
+
+  const opts = {
+    clientId: 'abcde'
+  }
+  const broker = aedes()
+  t.teardown(broker.close.bind(broker))
+
+  const s = noError(willConnect(setup(broker), opts, function () {
+    s.inStream.end({
+      cmd: 'disconnect'
+    })
+  }), t)
+
+  s.broker.persistence.getWill({
+    id: opts.clientId
+  }, function (err, packet) {
+    t.error(err, 'no error')
+    t.notOk(packet)
+  })
+})
+
 test('does not store multiple will with same clientid', function (t) {
   t.plan(4)