Refactored

lib/handlers/connect.js

@@ -57,7 +57,6 @@ function handleConnect (client, packet, done) {
   if (packet.protocolVersion === 3 && clientId.length > 23) {
     returnCode = 2
   }
-  // console.log(returnCode)
   if (returnCode > 0) {
     var error = new Error(errorMessages[returnCode])
     error.errorCode = returnCode
@@ -137,18 +136,18 @@ function setKeepAlive (arg, done) {
 }
 
 function fetchSubs (arg, done) {
+  var client = this.client
   if (!this.packet.clean) {
-    this.client.broker.persistence.subscriptionsByClient({
-      id: this.client.id,
+    return client.broker.persistence.subscriptionsByClient({
+      id: client.id,
       done: done,
       arg: arg
     }, gotSubs)
-  } else {
-    arg.sessionPresent = false // [MQTT-3.2.2-1]
-    this.client.broker.persistence.cleanSubscriptions(
-      this.client,
-      done)
   }
+  arg.sessionPresent = false // [MQTT-3.2.2-1]
+  client.broker.persistence.cleanSubscriptions(
+    client,
+    done)
 }
 
 function gotSubs (err, subs, client) {
@@ -163,22 +162,22 @@ function restoreSubs (arg, done) {
   if (arg.subs) {
     handleSubscribe(this.client, { subscriptions: arg.subs, restore: true }, done)
     arg.sessionPresent = !!arg.subs // cast to boolean, [MQTT-3.2.2-2]
-  } else {
-    arg.sessionPresent = false // [MQTT-3.2.2-1], [MQTT-3.2.2-3]
-    done()
+    return
   }
+  arg.sessionPresent = false // [MQTT-3.2.2-1], [MQTT-3.2.2-3]
+  done()
 }
 
 function storeWill (arg, done) {
-  this.client.will = this.client._will
-  if (this.client.will) {
-    this.client.broker.persistence.putWill(
-      this.client,
-      this.client.will,
+  var client = this.client
+  client.will = client._will
+  if (client.will) {
+    return client.broker.persistence.putWill(
+      client,
+      client.will,
       done)
-  } else {
-    done()
   }
+  done()
 }
 
 function registerClient (arg, done) {
@@ -213,7 +212,6 @@ function emptyQueue (arg, done) {
 
 function emptyQueueFilter (err, client, packet) {
   var next = packet.writeCallback
-  var persistence = client.broker.persistence
 
   if (err) {
     client.emit('error', err)
@@ -226,6 +224,8 @@ function emptyQueueFilter (err, client, packet) {
     authorized = client.broker.authorizeForward(client, packet)
   }
 
+  var persistence = client.broker.persistence
+
   if (client.clean || !authorized) {
     persistence.outgoingClearMessageId(client, packet, next)
   } else {