@pi-r/mysql 0.3.4 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/mysql
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/mysql
+
+## LICENSE
+
 MIT

package/client/index.d.ts

@@ -1,11 +1,11 @@
-import type { IDb } from '@e-mc/types/lib';
-
-import type { IDbSourceClient } from '@e-mc/db/types';
-
-import type { MySQLCredential, MySQLDataSource } from '../types';
-
-declare const MySQL: IDbSourceClient<MySQLDataSource> & {
-    setAuthentication(this: IDb, credential: MySQLCredential): void;
-};
-
+import type { IDb } from '@e-mc/types/lib';
+
+import type { IDbSourceClient } from '@e-mc/db/types';
+
+import type { MySQLCredential, MySQLDataSource } from '../types';
+
+declare const MySQL: IDbSourceClient<MySQLDataSource> & {
+    setAuthentication(this: IDb, credential: MySQLCredential): void;
+};
+
 export = MySQL;

package/client/index.js

@@ -1,8 +1,6 @@
 "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");
@@ -107,6 +105,7 @@ 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;
@@ -120,7 +119,7 @@ function setCredential(item) {
                     (_d = credential.queueLimit) !== null && _d !== void 0 ? _d : (credential.queueLimit = queue_max);
                 }
             }
-            new MySQLPool(mysql.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MySQLPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -137,6 +136,7 @@ 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 mysql.createConnection(removeUUIDKey(mysqlCredential || credential)));
+            clients.push(client = await db.createConnection(removeUUIDKey(mysqlCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {
@@ -282,7 +282,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (streamRow) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
-                    const client = mysql2Client || main.createConnection(removeUUIDKey(mysql2Credential || credential));
+                    const { createConnection } = require("mysql2");
+                    const client = mysql2Client || createConnection(removeUUIDKey(mysql2Credential || credential));
                     clients.push(client);
                     if (connectOnce) {
                         if (!parallel) {

package/client/pool.js

@@ -0,0 +1,61 @@
+"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;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/mysql",
-  "version": "0.3.4",
-  "description": "MySQL 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",
-    "directory": "src/db/mysql"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/db": "^0.6.3",
-    "@e-mc/types": "^0.6.3",
-    "mysql2": "^3.9.3"
-  }
-}
+{
+  "name": "@pi-r/mysql",
+  "version": "0.3.6",
+  "description": "MySQL 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",
+    "directory": "src/db/mysql"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/db": "^0.6.16",
+    "@e-mc/types": "^0.6.16",
+    "mysql2": "^3.10.3"
+  }
+}

package/types/index.d.ts

@@ -1,15 +1,15 @@
-import type { DbDataSource } from '@e-mc/types/lib/squared';
-
-import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
-
-import type { SecureContextOptions } from 'tls';
-
-import type { PoolOptions, QueryOptions } from 'mysql2/promise';
-
-export interface MySQLDataSource<T = unknown> extends DbDataSource<string | QueryOptions, unknown, unknown, string | MySQLCredential, string>, ExecuteAction<T> {
-    source: "mysql";
-}
-
-export interface MySQLCredential extends ServerAuth, Omit<PoolOptions, "ssl"> {
-    ssl?: boolean | string | SecureContextOptions & { rejectUnauthorized?: boolean };
+import type { DbDataSource } from '@e-mc/types/lib/squared';
+
+import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
+
+import type { SecureContextOptions } from 'tls';
+
+import type { PoolOptions, QueryOptions } from 'mysql2/promise';
+
+export interface MySQLDataSource<T = unknown> extends DbDataSource<string | QueryOptions, unknown, unknown, string | MySQLCredential, string>, ExecuteAction<T> {
+    source: "mysql";
+}
+
+export interface MySQLCredential extends ServerAuth, Omit<PoolOptions, "ssl"> {
+    ssl?: boolean | string | SecureContextOptions & { rejectUnauthorized?: boolean };
 }