@pi-r/mariadb 0.3.6 → 0.3.8

package/client/index.js

@@ -1,6 +1,7 @@
 "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 mariadb = require("mariadb");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -111,7 +112,6 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mariadb");
             const config = this.getPoolConfig("mariadb", password);
             if (config) {
                 const { max, idle } = config;
@@ -122,7 +122,7 @@ function setCredential(item) {
                     (_b = credential.idleTimeout) !== null && _b !== void 0 ? _b : (credential.idleTimeout = idle);
                 }
             }
-            new MariaDBPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MariaDBPool(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -139,7 +139,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mariadb");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -205,7 +204,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = await db.createConnection(removeUUIDKey(mariaDBCredential || credential)));
+            clients.push(client = await mariadb.createConnection(removeUUIDKey(mariaDBCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "MariaDB 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",
     "mariadb": "^3.3.1"
   }
 }

package/client/pool.js

@@ -1,60 +0,0 @@
-"use strict";
-const types_1 = require("@e-mc/types");
-const DbPool = require('@e-mc/db/pool');
-const POOL_ACTIVE = new WeakSet();
-class MariaDBPool extends DbPool {
-    static CACHE_UNUSED = ['connectTimeout', 'socketTimeout', 'compress', 'keepAliveDelay', 'acquireTimeout', 'connectionLimit', 'idleTimeout', 'initializationTimeout', 'minDelayValidation', 'minimumIdle', 'resetAfterUse', 'noControlAfterUse', 'leakDetectionTimeout'];
-    static CACHE_IGNORE = ['initSql', 'sessionVariables', '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: cert.toString('utf8') };
-            }
-            else if ((0, types_1.isArray)(cert)) {
-                result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '') };
-            }
-            else {
-                result.ssl = { cert: "Unknown" };
-            }
-        }
-        return result;
-    }
-    async getConnection(credential) {
-        if (credential) {
-            POOL_ACTIVE.add(credential);
-        }
-        return this.client.getConnection();
-    }
-    async close() {
-        return this.client.end();
-    }
-    isEmpty() {
-        const client = this.client;
-        return this.closed || client.activeConnections() === 0 && client.taskQueueSize() === 0;
-    }
-    get closed() {
-        return this.client.closed;
-    }
-}
-module.exports = MariaDBPool;