@pi-r/mysql 0.3.6 → 0.3.8

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");
@@ -105,7 +107,6 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mysql2/promise");
             const config = this.getPoolConfig("mysql", password);
             if (config) {
                 const { max, idle, queue_max } = config;
@@ -119,7 +120,7 @@ function setCredential(item) {
                     (_d = credential.queueLimit) !== null && _d !== void 0 ? _d : (credential.queueLimit = queue_max);
                 }
             }
-            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);
@@ -136,7 +137,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mysql2/promise");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -202,7 +202,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) {
@@ -282,8 +282,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (streamRow) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
-                    const { createConnection } = require("mysql2");
-                    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.3.6",
+  "version": "0.3.8",
   "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.6.16",
-    "@e-mc/types": "^0.6.16",
+    "@e-mc/db": "^0.6.19",
+    "@e-mc/types": "^0.6.19",
     "mysql2": "^3.10.3"
   }
 }

package/client/pool.js

@@ -1,61 +0,0 @@
-"use strict";
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/db/util");
-const DbPool = require('@e-mc/db/pool');
-const POOL_ACTIVE = new WeakSet();
-class MySQLPool extends DbPool {
-    static CACHE_UNUSED = ['connectTimeout', 'queueLimit', 'waitForConnections', 'connectionLimit', 'maxIdle', 'idleTimeout', 'enableKeepAlive', 'keepAliveInitialDelay', 'Promise'];
-    static CACHE_IGNORE = ['authPlugins', 'authSwitchHandler', 'stream', 'infileStreamFactory'];
-    static asString(credential) {
-        if ((credential.host || credential.socketPath) && credential.user) {
-            return JSON.stringify(this.removeUUIDKey(credential));
-        }
-        return super.asString(credential);
-    }
-    static sanitize(credential) {
-        if (!this.canCache(credential)) {
-            return;
-        }
-        if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
-            return credential;
-        }
-        const ssl = credential.ssl;
-        let result = super.sanitize(credential);
-        if ((0, types_1.isObject)(ssl)) {
-            if (result === credential) {
-                result = { ...credential };
-            }
-            const cert = ssl.cert;
-            if ((0, types_1.isString)(cert)) {
-                result.ssl = cert;
-            }
-            else if (Buffer.isBuffer(cert)) {
-                result.ssl = cert.toString('utf8');
-            }
-            else if ((0, types_1.isArray)(cert)) {
-                result.ssl = cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '');
-            }
-            else {
-                result.ssl = "Unknown";
-            }
-        }
-        return result;
-    }
-    async getConnection(credential) {
-        if (credential) {
-            POOL_ACTIVE.add(credential);
-        }
-        return this.client.getConnection();
-    }
-    async close() {
-        return this.client.end();
-    }
-    isEmpty() {
-        const pool = this.client.pool;
-        return this.closed || (0, util_1.checkEmpty)(pool._allConnections) && (0, util_1.checkEmpty)(pool._connectionQueue);
-    }
-    get closed() {
-        return !!this.client.pool._closed;
-    }
-}
-module.exports = MySQLPool;