Remove special case for handshake in determine packet code

Author: dougwilson

Changes.md

@@ -7,6 +7,7 @@ you spot any mistakes.
 ## HEAD
 
 * Fix `connection.threadId` missing on handshake failure
+* Remove special case for handshake in determine packet code
 * Small performance improvement starting command sequence
 
 ## v2.16.0 (2018-07-17)

lib/protocol/Protocol.js

@@ -156,9 +156,6 @@ Protocol.prototype._enqueue = function(sequence) {
       sequence._timer.active();
       self._emitPacket(packet);
     })
-    .on('end', function() {
-      self._dequeue(sequence);
-    })
     .on('timeout', function() {
       var err = new Error(sequence.constructor.name + ' inactivity timeout');
 
@@ -185,8 +182,20 @@ Protocol.prototype._enqueue = function(sequence) {
         sequence._tlsUpgradeCompleteHandler();
       });
     });
+
+    sequence.on('end', function () {
+      self._handshaked = true;
+
+      if (!self._fatalError) {
+        self.emit('handshake', self._handshakeInitializationPacket);
+      }
+    });
   }
 
+  sequence.on('end', function () {
+    self._dequeue(sequence);
+  });
+
   if (this._queue.length === 1) {
     this._parser.resetPacketNumber();
     this._startSequence(sequence);
@@ -311,12 +320,7 @@ Protocol.prototype._determinePacket = function(sequence) {
   }
 
   switch (firstByte) {
-    case 0x00:
-      if (!this._handshaked) {
-        this._handshaked = true;
-        this.emit('handshake', this._handshakeInitializationPacket);
-      }
-      return Packets.OkPacket;
+    case 0x00: return Packets.OkPacket;
     case 0xfe: return Packets.EofPacket;
     case 0xff: return Packets.ErrorPacket;
   }