Support Node.js 11.x

Author: dougwilson

.travis.yml

@@ -15,6 +15,7 @@ node_js:
   - "8.13"
   - "9.11"
   - "10.13"
+  - "11.2"
 env:
   global:
     # Necessary to build Node.js 0.6 on Travis CI images

Changes.md

@@ -11,6 +11,7 @@ you spot any mistakes.
 * Fix no password support for old password protocol
 * Remove special case for handshake in determine packet code
 * Small performance improvement starting command sequence
+* Support Node.js 11.x
 
 ## v2.16.0 (2018-07-17)
 

appveyor.yml

@@ -20,6 +20,7 @@ environment:
     - nodejs_version: "8.13"
     - nodejs_version: "9.11"
     - nodejs_version: "10.13"
+    - nodejs_version: "11.2"
 
 services:
   - mysql

lib/Connection.js

@@ -277,52 +277,52 @@ Connection.prototype.format = function(sql, values) {
 if (tls.TLSSocket) {
   // 0.11+ environment
   Connection.prototype._startTLS = function _startTLS(onSecure) {
-    var connection    = this;
-    var secureContext = tls.createSecureContext({
-      ca         : this.config.ssl.ca,
-      cert       : this.config.ssl.cert,
-      ciphers    : this.config.ssl.ciphers,
-      key        : this.config.ssl.key,
-      passphrase : this.config.ssl.passphrase
-    });
-
-    // "unpipe"
-    this._socket.removeAllListeners('data');
-    this._protocol.removeAllListeners('data');
-
-    // socket <-> encrypted
-    var rejectUnauthorized = this.config.ssl.rejectUnauthorized;
-    var secureEstablished  = false;
-    var secureSocket       = new tls.TLSSocket(this._socket, {
-      rejectUnauthorized : rejectUnauthorized,
-      requestCert        : true,
-      secureContext      : secureContext,
-      isServer           : false
-    });
+    var connection = this;
 
-    // error handler for secure socket
-    secureSocket.on('_tlsError', function(err) {
-      if (secureEstablished) {
-        connection._handleNetworkError(err);
-      } else {
+    createSecureContext(this.config, function (err, secureContext) {
+      if (err) {
         onSecure(err);
+        return;
       }
-    });
 
-    // cleartext <-> protocol
-    secureSocket.pipe(this._protocol);
-    this._protocol.on('data', function(data) {
-      secureSocket.write(data);
-    });
+      // "unpipe"
+      connection._socket.removeAllListeners('data');
+      connection._protocol.removeAllListeners('data');
+
+      // socket <-> encrypted
+      var rejectUnauthorized = connection.config.ssl.rejectUnauthorized;
+      var secureEstablished  = false;
+      var secureSocket       = new tls.TLSSocket(connection._socket, {
+        rejectUnauthorized : rejectUnauthorized,
+        requestCert        : true,
+        secureContext      : secureContext,
+        isServer           : false
+      });
 
-    secureSocket.on('secure', function() {
-      secureEstablished = true;
+      // error handler for secure socket
+      secureSocket.on('_tlsError', function(err) {
+        if (secureEstablished) {
+          connection._handleNetworkError(err);
+        } else {
+          onSecure(err);
+        }
+      });
 
-      onSecure(rejectUnauthorized ? this.ssl.verifyError() : null);
-    });
+      // cleartext <-> protocol
+      secureSocket.pipe(connection._protocol);
+      connection._protocol.on('data', function(data) {
+        secureSocket.write(data);
+      });
 
-    // start TLS communications
-    secureSocket._start();
+      secureSocket.on('secure', function() {
+        secureEstablished = true;
+
+        onSecure(rejectUnauthorized ? this.ssl.verifyError() : null);
+      });
+
+      // start TLS communications
+      secureSocket._start();
+    });
   };
 } else {
   // pre-0.11 environment
@@ -458,6 +458,25 @@ Connection.prototype._implyConnect = function() {
   }
 };
 
+function createSecureContext (config, cb) {
+  var context = null;
+  var error   = null;
+
+  try {
+    context = tls.createSecureContext({
+      ca         : config.ssl.ca,
+      cert       : config.ssl.cert,
+      ciphers    : config.ssl.ciphers,
+      key        : config.ssl.key,
+      passphrase : config.ssl.passphrase
+    });
+  } catch (err) {
+    error = err;
+  }
+
+  cb(error, context);
+}
+
 function unwrapFromDomain(fn) {
   return function () {
     var domains = [];