Reset keepalive timer on PUBACK.

References #123.
moscajs · Apr 22, 2014 · 4d1f8fc · 4d1f8fc
1 parent 8e9cb41
commit 4d1f8fc
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -70,6 +70,7 @@ Client.prototype._setup = function() {
   });
 
   client.on("puback", function(packet) {
+    that.setUpTimer();
     that.handlePuback(packet);
   });
 

diff --git a/test/abstract_server.js b/test/abstract_server.js
@@ -286,11 +286,6 @@ module.exports = function(moscaSettings, createConnection) {
         opts.keepalive = keepalive;
 
         var messageId = Math.floor(65535 * Math.random());
-        var subscriptions = [{
-            topic: "hello",
-            qos: 0
-          }
-        ];
 
         client.connect(opts);
 
@@ -311,6 +306,56 @@ module.exports = function(moscaSettings, createConnection) {
       });
     });
 
+    it("should correctly renew the keepalive window after a puback", function(done) {
+      buildClient(done, function(client) {
+        var keepalive = 1;
+
+        var opts = buildOpts();
+        opts.keepalive = keepalive;
+        var closed = false;
+        var timer;
+
+        var messageId = Math.floor(65535 * Math.random());
+        var subscriptions = [{
+            topic: "hello",
+            qos: 1
+          }
+        ];
+
+        client.connect(opts);
+
+        client.on("connack", function() {
+          client.subscribe({
+            subscriptions: subscriptions,
+            messageId: messageId
+          });
+        });
+
+        client.on("suback", function() {
+          timer = Date.now();
+          instance.publish({ topic: "hello", payload: "world" });
+        });
+
+        client.stream.on("close", function() {
+          closed = true;
+          var interval = (Date.now() - timer) / 1000;
+          expect(interval).to.be.least(keepalive + keepalive / 2);
+        });
+
+        client.on("publish", function(packet) {
+          if (closed) {
+            return;
+          }
+
+          setTimeout(function() {
+            client.puback({ messageId: packet.messageId });
+          }, keepalive * 1000 / 2);
+        });
+
+        fastForward(100, 4000);
+      });
+    });
+
     it("should correctly renew the keepalive window after an unsubscribe", function(done) {
       buildClient(done, function(client) {
         var keepalive = 1;