@pi-r/mysql 0.2.7 → 0.5.0

package/client/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
+const main = require("mysql2");
+const mysql = require("mysql2/promise");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -104,10 +106,9 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mysql2/promise" /* STRINGS.PACKAGE_NAME */);
             const config = this.getPoolConfig("mysql" /* STRINGS.MODULE_NAME */, password);
             if (config) {
-                const { max, idle, queue_max } = config;
+                const { max, idle, queue_max, timeout } = config;
                 if (max > 0) {
                     credential.connectionLimit ?? (credential.connectionLimit = max);
                 }
@@ -117,8 +118,11 @@ function setCredential(item) {
                 if (queue_max >= 0) {
                     credential.queueLimit ?? (credential.queueLimit = queue_max);
                 }
+                if (timeout > 0) {
+                    credential.connectTimeout ?? (credential.connectTimeout = timeout);
+                }
             }
-            new MySQLPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MySQLPool(mysql.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -135,7 +139,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mysql2/promise" /* STRINGS.PACKAGE_NAME */);
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -201,7 +204,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = await db.createConnection(removeUUIDKey(mysqlCredential || credential)));
+            clients.push(client = await mysql.createConnection(removeUUIDKey(mysqlCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {
@@ -281,8 +284,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (streamRow) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
-                    const { createConnection } = require("mysql2" /* STRINGS.PACKAGE_STREAM */);
-                    const client = mysql2Client || createConnection(removeUUIDKey(mysql2Credential || credential));
+                    const client = mysql2Client || main.createConnection(removeUUIDKey(mysql2Credential || credential));
                     clients.push(client);
                     if (connectOnce) {
                         if (!parallel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.2.7",
+  "version": "0.5.0",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "mysql2": "^3.5.2"
+    "@e-mc/db": "^0.7.0",
+    "@e-mc/types": "^0.7.0",
+    "mysql2": "^3.6.5"
   }
 }