Fix "connection.threadId" missing on handshake failure

Author: dougwilson

Changes.md

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

lib/Connection.js

@@ -100,6 +100,7 @@ Connection.prototype.connect = function connect(options, callback) {
     this._socket.on('error', this._handleNetworkError.bind(this));
     this._socket.on('connect', this._handleProtocolConnect.bind(this));
     this._protocol.on('handshake', this._handleProtocolHandshake.bind(this));
+    this._protocol.on('initialize', this._handleProtocolInitialize.bind(this));
     this._protocol.on('unhandledError', this._handleProtocolError.bind(this));
     this._protocol.on('drain', this._handleProtocolDrain.bind(this));
     this._protocol.on('end', this._handleProtocolEnd.bind(this));
@@ -434,8 +435,11 @@ Connection.prototype._handleProtocolConnect = function() {
   this.emit('connect');
 };
 
-Connection.prototype._handleProtocolHandshake = function _handleProtocolHandshake(packet) {
-  this.state    = 'authenticated';
+Connection.prototype._handleProtocolHandshake = function _handleProtocolHandshake() {
+  this.state = 'authenticated';
+};
+
+Connection.prototype._handleProtocolInitialize = function _handleProtocolInitialize(packet) {
   this.threadId = packet.threadId;
 };
 

lib/protocol/Protocol.js

@@ -265,6 +265,7 @@ Protocol.prototype._parsePacket = function() {
 
   if (Packet === Packets.HandshakeInitializationPacket) {
     this._handshakeInitializationPacket = packet;
+    this.emit('initialize', packet);
   }
 
   sequence._timer.active();

test/unit/connection/test-connection-thread-id-error.js

@@ -0,0 +1,25 @@
+var assert     = require('assert');
+var common     = require('../../common');
+var connection = common.createConnection({port: common.fakeServerPort});
+
+var server = common.createFakeServer();
+
+server.listen(common.fakeServerPort, function (err) {
+  assert.ifError(err);
+  assert.strictEqual(connection.threadId, null);
+
+  connection.connect(function (err) {
+    assert.ok(err);
+    assert.strictEqual(err.code, 'ER_ACCESS_DENIED_ERROR');
+    assert.strictEqual(connection.threadId, 42);
+
+    server.destroy();
+  });
+});
+
+server.on('connection', function (incomingConnection) {
+  incomingConnection.handshake({threadId: 42});
+  incomingConnection.on('clientAuthentication', function () {
+    this.deny();
+  });
+});

test/unit/connection/test-debug-parser-error.js

@@ -21,7 +21,7 @@ server.listen(common.fakeServerPort, function (err) {
     assert.equal(messages.length, 6);
     assert.deepEqual(messages, [
       '<-- HandshakeInitializationPacket',
-      '--> ClientAuthenticationPacket',
+      '--> (1) ClientAuthenticationPacket',
       '<-- (1) OkPacket',
       '--> (1) ComQueryPacket',
       '<-- (1) ResultSetHeaderPacket',

test/unit/connection/test-debug.js

@@ -21,7 +21,7 @@ server.listen(common.fakeServerPort, function (err) {
     assert.equal(messages.length, 5);
     assert.deepEqual(messages, [
       '<-- HandshakeInitializationPacket',
-      '--> ClientAuthenticationPacket',
+      '--> (1) ClientAuthenticationPacket',
       '<-- (1) OkPacket',
       '--> (1) ComPingPacket',
       '<-- (1) OkPacket'

test/unit/pool/test-debug.js

@@ -31,7 +31,7 @@ server.listen(common.fakeServerPort, function (err) {
             assert.equal(messages.length, 20);
             assert.deepEqual(messages, [
               '<-- HandshakeInitializationPacket',
-              '--> ClientAuthenticationPacket',
+              '--> (1) ClientAuthenticationPacket',
               '<-- (1) OkPacket',
               '--> (1) ComQueryPacket',
               '<-- (1) ResultSetHeaderPacket',
@@ -40,7 +40,7 @@ server.listen(common.fakeServerPort, function (err) {
               '<-- (1) RowDataPacket',
               '<-- (1) EofPacket',
               '<-- HandshakeInitializationPacket',
-              '--> ClientAuthenticationPacket',
+              '--> (2) ClientAuthenticationPacket',
               '<-- (2) OkPacket',
               '--> (2) ComQueryPacket',
               '<-- (2) ResultSetHeaderPacket',