@pi-r/mariadb 0.11.3 → 0.12.1

package/client/index.js

@@ -1,26 +1,21 @@
 "use strict";
-exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = void 0;
-exports.setAuthentication = setAuthentication;
-exports.setCredential = setCredential;
-exports.executeQuery = executeQuery;
-exports.executeBatchQuery = executeBatchQuery;
-exports.checkTimeout = checkTimeout;
-const mariadb = require("mariadb");
-const Db = require("@e-mc/db");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/db/util");
-const DbPool = require("@pi-r/mariadb/client/pool");
+
+const mariadb = require('mariadb');
+const Db = require('@e-mc/db');
+const { DB_TYPE, asFunction, errorMessage, isArray, isError, isErrorCode, isPlainObject, isString } = require('@e-mc/types');
+const { parseConnectionString, parseServerAuth } = require('@e-mc/db/util');
+const DbPool = require('@pi-r/mariadb/client/pool');
 const POOL_STATE = {};
 function isOkPacket(value) {
     const result = Array.isArray(value) ? value[0] : value;
     return !!result && !Array.isArray(result) && result.constructor.name === 'OkPacket';
 }
 function setAuthentication(credential) {
-    const auth = (0, util_1.parseServerAuth)(credential);
+    const auth = parseServerAuth(credential);
     credential.host ||= auth.hostname;
     credential.user ||= auth.username;
     credential.port ||= 3306;
-    if ((0, types_1.isPlainObject)(credential.ssl)) {
+    if (isPlainObject(credential.ssl)) {
         this.readTLSConfig(credential.ssl);
     }
 }
@@ -32,7 +27,7 @@ function setCredential(item) {
     else {
         credential = {};
         if (item.uri) {
-            const connection = (0, util_1.parseConnectionString)(item.uri);
+            const connection = parseConnectionString(item.uri);
             if (connection) {
                 const { username, password, hostname, port, database } = connection;
                 credential.host = hostname;
@@ -54,12 +49,12 @@ function setCredential(item) {
         errors.push('user');
     }
     if (errors.length > 0) {
-        throw (0, types_1.errorMessage)("mariadb", "Invalid credentials", errors.join(', '));
+        throw errorMessage("mariadb", "Invalid credentials", errors.join(', '));
     }
     if (credential.host?.endsWith('.rds.amazonaws.com')) {
         try {
             const ssl = credential.ssl ||= {};
-            if ((0, types_1.isPlainObject)(ssl) && !ssl.ca) {
+            if (isPlainObject(ssl) && !ssl.ca) {
                 const bundle = require('aws-ssl-profiles');
                 ssl.ca = bundle.ca;
             }
@@ -76,7 +71,7 @@ function setCredential(item) {
         return;
     }
     let username, password, pool;
-    if ((0, types_1.isString)(usePool)) {
+    if (isString(usePool)) {
         username = credential.user;
         if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
@@ -134,7 +129,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         return [];
     }
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
-    if ((0, types_1.isPlainObject)(options)) {
+    if (isPlainObject(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
     }
     else {
@@ -154,6 +149,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         outResult ||= new Array(length);
     }
     const caching = this.hasCache("mariadb", sessionKey);
+    const sortKeys = this.settingsOf("mariadb", 'cache', 'sort_keys') === true;
     const tasks = new Array(length);
     const clients = [];
     const pools = [];
@@ -177,20 +173,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             catch (err) {
                 let close;
-                switch (err instanceof Error && err.code) {
-                    case 'ER_ACCESS_DENIED_ERROR':
-                    case 'ER_DBACCESS_DENIED_ERROR':
-                    case 'ER_SPECIFIC_ACCESS_DENIED_ERROR':
-                    case 'ER_ACCESS_DENIED_NO_PASSWORD_ERROR':
-                        close = 1;
-                        break;
-                    default:
-                        close = pool.closeable;
-                        break;
+                if (!isErrorCode(err, 'ER_ACCESS_DENIED_ERROR', 'ER_DBACCESS_DENIED_ERROR', 'ER_SPECIFIC_ACCESS_DENIED_ERROR', 'ER_ACCESS_DENIED_NO_PASSWORD_ERROR')) {
+                    close = pool.closeable;
                 }
-                if (close) {
+                if (close !== false) {
                     await pool.detach(true);
-                    if (close === 1) {
+                    if (!close) {
                         throw err;
                     }
                 }
@@ -215,7 +203,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     for (let i = 0, statement; i < length; ++i) {
         const item = batch[i];
         const { source, params, ignoreCache } = item;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mariadb", 'options', item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mariadb", 'options', item.credential) && asFunction(item.streamRow) : item.streamRow;
         let credential = mariaDBCredential || onceCredential, query = item.query, prepared = false, error;
         if (typeof item.preparedStatement === 'boolean') {
             if (item.preparedStatement) {
@@ -235,7 +223,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             query = statement;
             prepared = true;
         }
-        if (!(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
+        if (!isPlainObject(credential = item.credential) && (error = errorMessage(source, "Invalid credentials")) || !query && (error = errorMessage(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -253,11 +241,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         item.transactionState = 1;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
-        let queryString = '';
+        let queryString = '', cacheCredential;
         if (caching && ignoreCache !== true && !prepared && !streamRow) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true);
+            cacheCredential = DbPool.sanitize(credential, sortKeys);
             if (ignoreCache !== 1) {
-                const result = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
+                const result = this.getQueryResult(source, cacheCredential, queryString, cacheValue);
                 if (result) {
                     if (parallel) {
                         tasks[i] = Promise.resolve(result);
@@ -301,7 +290,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 if (err === false) {
                                     continue;
                                 }
-                                if (err instanceof Error) {
+                                if (isError(err)) {
                                     error = err;
                                     continue;
                                 }
@@ -317,19 +306,19 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                     else {
                         this.add(item, 4);
-                        resolve(!error ? this.setQueryResult(source, DbPool.sanitize(credential), queryString, rows, cacheValue) : rows.length > 0 ? rows : null);
+                        resolve(!error ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : rows.length > 0 ? rows : null);
                     }
                 }
                 else {
                     const rows = await client[prepared && connectOnce && !parallel ? 'execute' : 'query'](query, params);
                     this.add(item, 4);
-                    if ((0, types_1.isArray)(rows)) {
+                    if (isArray(rows)) {
                         const [row1, row2] = rows;
                         if (rows.length === 2 && Array.isArray(row1) && !Array.isArray(row2) && isOkPacket(row2)) {
                             resolve(row1);
                         }
                         else {
-                            resolve(!isOkPacket(row1) ? this.setQueryResult(source, DbPool.sanitize(credential), queryString, rows, cacheValue) : null);
+                            resolve(!isOkPacket(row1) ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : null);
                         }
                     }
                     else {
@@ -371,5 +360,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
 async function checkTimeout(value, limit = 0) {
     return DbPool.checkTimeout(POOL_STATE, value, limit);
 }
-exports.DB_SOURCE_CLIENT = true;
-exports.DB_SOURCE_TYPE = types_1.DB_TYPE.SQL;
+const DB_SOURCE_CLIENT = true;
+const DB_SOURCE_TYPE = DB_TYPE.SQL;
+
+exports.DB_SOURCE_CLIENT = DB_SOURCE_CLIENT;
+exports.DB_SOURCE_TYPE = DB_SOURCE_TYPE;
+exports.checkTimeout = checkTimeout;
+exports.executeBatchQuery = executeBatchQuery;
+exports.executeQuery = executeQuery;
+exports.setAuthentication = setAuthentication;
+exports.setCredential = setCredential;

package/client/pool.js

@@ -1,5 +1,6 @@
 "use strict";
-const types_1 = require("@e-mc/types");
+
+const { isArray, isObject, isString } = require('@e-mc/types');
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class MariaDBPool extends DbPool {
@@ -11,7 +12,7 @@ class MariaDBPool extends DbPool {
         }
         return super.asString(credential);
     }
-    static sanitize(credential) {
+    static sanitize(credential, sort) {
         if (!this.canCache(credential)) {
             return;
         }
@@ -19,19 +20,19 @@ class MariaDBPool extends DbPool {
             return credential;
         }
         const ssl = credential.ssl;
-        let result = super.sanitize(credential);
-        if ((0, types_1.isObject)(ssl)) {
+        let result = super.sanitize(credential, sort);
+        if (isObject(ssl)) {
             if (result === credential) {
                 result = { ...credential };
             }
             const cert = ssl.cert;
-            if ((0, types_1.isString)(cert)) {
+            if (isString(cert)) {
                 result.ssl = { cert };
             }
             else if (Buffer.isBuffer(cert)) {
                 result.ssl = { cert: cert.toString('utf8') };
             }
-            else if ((0, types_1.isArray)(cert)) {
+            else if (isArray(cert)) {
                 result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '') };
             }
             else {
@@ -57,4 +58,5 @@ class MariaDBPool extends DbPool {
         return this.client.closed;
     }
 }
+
 module.exports = MariaDBPool;

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "description": "MariaDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -20,8 +17,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.13.10",
-    "@e-mc/types": "^0.13.10",
+    "@e-mc/db": "^0.14.1",
+    "@e-mc/types": "^0.14.1",
     "mariadb": "^3.5.2"
   }
 }