Merge pull request #15 from rodrigogs/allow_connection_pool

Allowing connection pools

Author: rodrigogs

.npmignore

@@ -1,3 +1,4 @@
+/.vscode/
 /.idea/
 /.circleci/
 /example/

lib/MySQLEvents.js

@@ -7,11 +7,11 @@ const connectionHandler = require('./connectionHandler');
 const EVENTS = require('./EVENTS.enum');
 const STATEMENTS = require('./STATEMENTS.enum');
 
+/**
+ * @param {Object|Connection|String} connection
+ * @param {Object} options
+ */
 class MySQLEvents extends EventEmitter {
-  /**
-   * @param {Object|Connection|String} connection
-   * @param {Object} options
-   */
   constructor(connection, options = {}) {
     super();
 
@@ -88,7 +88,7 @@ class MySQLEvents extends EventEmitter {
     this.connection = await connectionHandler(this.connection);
 
     debug('initializing zongji');
-    this.zongJi = new ZongJi(this.connection, Object.assign(this.options, options));
+    this.zongJi = new ZongJi(this.connection, Object.assign({}, this.options, options));
 
     debug('connected');
     this.emit('connected');
@@ -107,7 +107,7 @@ class MySQLEvents extends EventEmitter {
     debug('disconnecting from mysql');
 
     this.zongJi.stop();
-    this.zongJi = null;
+    delete this.zongJi;
 
     await new Promise((resolve, reject) => {
       this.connection.end((err) => {
@@ -129,7 +129,6 @@ class MySQLEvents extends EventEmitter {
     if (!this.isStarted || this.isPaused) return;
     debug('pausing connection');
 
-    this.zongJi.ctrlConnection.pause();
     this.zongJi.connection.pause();
     this.isPaused = true;
     this.emit(EVENTS.PAUSED);
@@ -142,7 +141,6 @@ class MySQLEvents extends EventEmitter {
     if (!this.isStarted || !this.isPaused) return;
     debug('resuming connection');
 
-    this.zongJi.ctrlConnection.resume();
     this.zongJi.connection.resume();
     this.isPaused = false;
     this.emit(EVENTS.RESUMED);

lib/connectionHandler.js

@@ -1,15 +1,23 @@
 const debug = require('debuggler')();
 const mysql = require('mysql');
 const Connection = require('mysql/lib/Connection');
+const Pool = require('mysql/lib/Pool');
 
 const connect = connection => new Promise((resolve, reject) => connection.connect((err) => {
   if (err) return reject(err);
   resolve();
 }));
 
 const connectionHandler = async (connection) => {
+  if (connection instanceof Pool) {
+    debug('reusing pool:', connection);
+    if (connection._closed) {
+      connection = mysql.createPool(connection.config.connectionConfig);
+    }
+  }
+
   if (connection instanceof Connection) {
-    debug('creating connection from previous connection object:', connection);
+    debug('reusing connection:', connection);
     if (connection.state !== 'connected') {
       connection = mysql.createConnection(connection.config);
     }
@@ -20,12 +28,16 @@ const connectionHandler = async (connection) => {
     connection = mysql.createConnection(connection);
   }
 
-  if ((typeof connection === 'object') && !(connection instanceof Connection)) {
+  if ((typeof connection === 'object') && (!(connection instanceof Connection) && !(connection instanceof Pool))) {
     debug('creating connection from object:', connection);
-    connection = mysql.createConnection(connection);
+    if (connection.isPool) {
+      connection = mysql.createPool(connection);
+    } else {
+      connection = mysql.createConnection(connection);
+    }
   }
 
-  if (connection.state !== 'connected') {
+  if ((connection instanceof Connection) && (connection.state !== 'connected')) {
     debug('initializing connection');
     await connect(connection);
   }