Merge pull request mqttjs#334 from kokeksibir/master

mcollina · mcollina · commit ead0f4af1ec6 · 2015-10-26T10:57:20.000Z
Session Present flag is needed while handling connect event
diff --git a/README.md b/README.md
@@ -212,9 +212,12 @@ version 1.3 and 1.4 works fine without those.
 
 #### Event `'connect'`
 
-`function() {}`
+`function(connack) {}`
 
-Emitted on successful (re)connection (i.e. connack rc=0).
+Emitted on successful (re)connection (i.e. connack rc=0). 
+* `connack` received connack packet. When `clean` connection option is `false` and server has a previous session 
+for `clientId` connection option, then `connack.sessionPresent` flag is `true`. When that is the case, 
+you may rely on stored session and prefer not to send subscribe commands for the client.
 
 #### Event `'reconnect'`
 
diff --git a/lib/client.js b/lib/client.js
@@ -667,7 +667,7 @@ MqttClient.prototype._handleConnack = function (packet) {
   clearTimeout(this.connackTimer);
 
   if (0 === rc) {
-    this.emit('connect');
+    this.emit('connect', packet);
   } else if (0 < rc) {
     this.emit('error',
         new Error('Connection refused: ' + errors[rc]));
diff --git a/test/abstract_client.js b/test/abstract_client.js
@@ -199,6 +199,26 @@ module.exports = function (server, config) {
       client.once('error', done);
     });
 
+    it('should provide connack packet with connect event', function (done) {
+      server.once('client', function (serverClient) {
+        serverClient.connack({returnCode: 0, sessionPresent: true});
+
+        server.once('client', function (serverClient) {
+          serverClient.connack({returnCode: 0, sessionPresent: false});
+        });
+      });
+
+      var client = connect();
+      client.once('connect', function (packet) {
+        should(packet.sessionPresent).be.equal(true);
+        client.once('connect', function (packet) {
+          should(packet.sessionPresent).be.equal(false);
+          client.end();
+          done();
+        });
+      });
+    });
+
     it('should mark the client as connected', function (done) {
       var client = connect();
       client.once('connect', function () {
