Support Node.js 9.x

Author: dougwilson

.travis.yml

@@ -13,6 +13,7 @@ node_js:
   - "6.13"
   - "7.10"
   - "8.9"
+  - "9.8"
 env:
   global:
     # Necessary to build Node.js 0.6 on Travis CI images

Changes.md

@@ -8,6 +8,7 @@ you spot any mistakes.
 
 * Add Amazon RDS GovCloud SSL certificates #1876
 * Include connection ID in debug output
+* Support Node.js 9.x
 * Update Amazon RDS SSL certificates
 * Update `bignumber.js` to 4.1.0
 * Update `readable-stream` to 2.3.5

appveyor.yml

@@ -17,6 +17,7 @@ environment:
     - nodejs_version: "6.13"
     - nodejs_version: "7.10"
     - nodejs_version: "8.9"
+    - nodejs_version: "9.8"
 
 services:
   - mysql

lib/Connection.js

@@ -22,28 +22,16 @@ function Connection(options) {
   this.threadId       = null;
 }
 
-function bindToCurrentDomain(callback) {
-  if (!callback) {
-    return undefined;
-  }
-
-  var domain = process.domain;
-
-  return domain
-    ? domain.bind(callback)
-    : callback;
-}
-
 Connection.createQuery = function createQuery(sql, values, callback) {
   if (sql instanceof Query) {
     return sql;
   }
 
-  var cb      = bindToCurrentDomain(callback);
+  var cb      = wrapCallbackInDomain(null, callback);
   var options = {};
 
   if (typeof sql === 'function') {
-    cb = bindToCurrentDomain(sql);
+    cb = wrapCallbackInDomain(null, sql);
     return new Query(options, cb);
   }
 
@@ -53,7 +41,7 @@ Connection.createQuery = function createQuery(sql, values, callback) {
     }
 
     if (typeof values === 'function') {
-      cb = bindToCurrentDomain(values);
+      cb = wrapCallbackInDomain(null, values);
     } else if (values !== undefined) {
       options.values = values;
     }
@@ -65,7 +53,7 @@ Connection.createQuery = function createQuery(sql, values, callback) {
   options.values = values;
 
   if (typeof values === 'function') {
-    cb = bindToCurrentDomain(values);
+    cb = wrapCallbackInDomain(null, values);
     options.values = undefined;
   }
 
@@ -99,15 +87,15 @@ Connection.prototype.connect = function connect(options, callback) {
     this._protocol.on('data', function(data) {
       connection._socket.write(data);
     });
-    this._socket.on('data', function(data) {
+    this._socket.on('data', wrapToDomain(connection, function (data) {
       connection._protocol.write(data);
-    });
+    }));
     this._protocol.on('end', function() {
       connection._socket.end();
     });
-    this._socket.on('end', function() {
+    this._socket.on('end', wrapToDomain(connection, function () {
       connection._protocol.end();
-    });
+    }));
 
     this._socket.on('error', this._handleNetworkError.bind(this));
     this._socket.on('connect', this._handleProtocolConnect.bind(this));
@@ -127,7 +115,7 @@ Connection.prototype.connect = function connect(options, callback) {
     }
   }
 
-  this._protocol.handshake(options, bindToCurrentDomain(callback));
+  this._protocol.handshake(options, wrapCallbackInDomain(this, callback));
 };
 
 Connection.prototype.changeUser = function changeUser(options, callback) {
@@ -149,7 +137,7 @@ Connection.prototype.changeUser = function changeUser(options, callback) {
     timeout       : options.timeout,
     charsetNumber : charsetNumber,
     currentConfig : this.config
-  }, bindToCurrentDomain(callback));
+  }, wrapCallbackInDomain(this, callback));
 };
 
 Connection.prototype.beginTransaction = function beginTransaction(options, callback) {
@@ -203,6 +191,10 @@ Connection.prototype.query = function query(sql, values, cb) {
     query.sql = this.format(query.sql, query.values);
   }
 
+  if (query._callback) {
+    query._callback = wrapCallbackInDomain(this, query._callback);
+  }
+
   this._implyConnect();
 
   return this._protocol._enqueue(query);
@@ -215,7 +207,7 @@ Connection.prototype.ping = function ping(options, callback) {
   }
 
   this._implyConnect();
-  this._protocol.ping(options, bindToCurrentDomain(callback));
+  this._protocol.ping(options, wrapCallbackInDomain(this, callback));
 };
 
 Connection.prototype.statistics = function statistics(options, callback) {
@@ -225,7 +217,7 @@ Connection.prototype.statistics = function statistics(options, callback) {
   }
 
   this._implyConnect();
-  this._protocol.stats(options, bindToCurrentDomain(callback));
+  this._protocol.stats(options, wrapCallbackInDomain(this, callback));
 };
 
 Connection.prototype.end = function end(options, callback) {
@@ -246,7 +238,7 @@ Connection.prototype.end = function end(options, callback) {
   }
 
   this._implyConnect();
-  this._protocol.quit(opts, bindToCurrentDomain(cb));
+  this._protocol.quit(opts, wrapCallbackInDomain(this, cb));
 };
 
 Connection.prototype.destroy = function() {
@@ -461,3 +453,53 @@ Connection.prototype._implyConnect = function() {
     this.connect();
   }
 };
+
+function unwrapFromDomain(fn) {
+  return function () {
+    var domains = [];
+    var ret;
+
+    while (process.domain) {
+      domains.shift(process.domain);
+      process.domain.exit();
+    }
+
+    try {
+      ret = fn.apply(this, arguments);
+    } finally {
+      for (var i = 0; i < domains.length; i++) {
+        domains[i].enter();
+      }
+    }
+
+    return ret;
+  };
+}
+
+function wrapCallbackInDomain(ee, fn) {
+  if (typeof fn !== 'function' || fn.domain) {
+    return fn;
+  }
+
+  var domain = process.domain;
+
+  if (domain) {
+    return domain.bind(fn);
+  } else if (ee) {
+    return unwrapFromDomain(wrapToDomain(ee, fn));
+  } else {
+    return fn;
+  }
+}
+
+function wrapToDomain(ee, fn) {
+  return function () {
+    if (Events.usingDomains && ee.domain) {
+      ee.domain.enter();
+      fn.apply(this, arguments);
+      ee.domain.exit();
+    } else {
+      fn.apply(this, arguments);
+    }
+  };
+}