@pi-r/mysql 0.9.4 → 0.10.0

package/client/index.js

@@ -51,7 +51,7 @@ function setCredential(item) {
             errors.push('user');
         }
         if (errors.length > 0) {
-            throw (0, types_1.errorMessage)("mysql", 'Not defined - ' + errors.join(' | '));
+            throw (0, types_1.errorMessage)("mysql", "Invalid credentials", errors.join(', '));
         }
     }
     else {
@@ -76,9 +76,14 @@ function setCredential(item) {
     if (!usePool) {
         return;
     }
+    else if (credential.authPlugins || credential.stream || credential.authSwitchHandler) {
+        item.usePool = undefined;
+        return;
+    }
     let username, password, pool;
     if ((0, types_1.isString)(usePool)) {
-        if (username = credential.user || credential.uri && (0, util_1.parseConnectionString)(credential.uri)?.username) {
+        username = credential.user || credential.uri && (0, util_1.parseConnectionString)(credential.uri)?.username;
+        if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);

package/client/pool.js

@@ -4,6 +4,8 @@ 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));
@@ -11,6 +13,9 @@ class MySQLPool extends DbPool {
         return super.asString(credential);
     }
     static sanitize(credential) {
+        if (!this.canCache(credential)) {
+            return;
+        }
         if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
             return credential;
         }
@@ -25,10 +30,10 @@ class MySQLPool extends DbPool {
                 result.ssl = cert;
             }
             else if (Buffer.isBuffer(cert)) {
-                result.ssl = cert.toString('utf-8');
+                result.ssl = cert.toString('utf8');
             }
             else if ((0, types_1.isArray)(cert)) {
-                result.ssl = cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf-8') : b), '');
+                result.ssl = cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '');
             }
             else {
                 result.ssl = "Unknown";
@@ -53,5 +58,4 @@ class MySQLPool extends DbPool {
         return !!this.client.pool._closed;
     }
 }
-MySQLPool.CACHE_UNUSED = ['connectTimeout', 'queueLimit', 'waitForConnections', 'connectionLimit', 'maxIdle', 'idleTimeout', 'enableKeepAlive', 'keepAliveInitialDelay', 'Promise'];
 module.exports = MySQLPool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.9.4",
+  "version": "0.10.0",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.11.5",
-    "@e-mc/types": "^0.11.5",
+    "@e-mc/db": "^0.12.0",
+    "@e-mc/types": "^0.12.0",
     "mysql2": "^3.14.0"
   }
 }