fix: missed messageId 0 (#652)

moscajs · Jul 16, 2021 · ac54f2e · ac54f2e
1 parent 8ee88f7
commit ac54f2e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/lib/handlers/subscribe.js b/lib/handlers/subscribe.js
@@ -184,7 +184,7 @@ function completeSubscribe (err) {
   const packet = this.packet
   const client = this.client
 
-  if (packet.messageId) {
+  if (packet.messageId !== undefined) {
     // [MQTT-3.9.3-1]
     write(client,
       new SubAck(packet, this.subState.map(obj => obj.granted)),
@@ -234,6 +234,6 @@ function completeSubscribe (err) {
   }))
 }
 
-function noop () {}
+function noop () { }
 
 module.exports = handleSubscribe
diff --git a/lib/handlers/unsubscribe.js b/lib/handlers/unsubscribe.js
@@ -26,7 +26,7 @@ function handleUnsubscribe (client, packet, done) {
     }
   }
 
-  if (packet.messageId) {
+  if (packet.messageId !== undefined) {
     if (client.clean) {
       return actualUnsubscribe(client, packet, done)
     }
@@ -80,7 +80,7 @@ function completeUnsubscribe (err) {
   const packet = this.packet
   const done = this.finish
 
-  if (packet.messageId) {
+  if (packet.messageId !== undefined) {
     write(client, new UnSubAck(packet),
       done)
   } else {
@@ -99,6 +99,6 @@ function completeUnsubscribe (err) {
   }
 }
 
-function noop () {}
+function noop () { }
 
 module.exports = handleUnsubscribe
diff --git a/test/basic.js b/test/basic.js
@@ -260,6 +260,35 @@ test('subscribe should have messageId', function (t) {
   })
 })
 
+test('subscribe with messageId 0 should return suback', function (t) {
+  t.plan(1)
+
+  const s = connect(setup())
+  t.teardown(s.broker.close.bind(s.broker))
+
+  s.inStream.write({
+    cmd: 'subscribe',
+    subscriptions: [{
+      topic: 'hello',
+      qos: 0
+    }],
+    messageId: 0
+  })
+  s.outStream.once('data', function (packet) {
+    t.same(packet, {
+      cmd: 'suback',
+      messageId: 0,
+      dup: false,
+      length: 3,
+      qos: 0,
+      retain: false,
+      granted: [
+        0
+      ]
+    }, 'packet matches')
+  })
+})
+
 test('unsubscribe', function (t) {
   t.plan(5)